Compare commits
	
		
			24 Commits
		
	
	
		
			c82d771d2e
			...
			merlin-dev
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 6453f1c468 | ||
|  | 3001fb8d57 | ||
|  | a150b58aaa | ||
|  | cc18e247c4 | ||
|  | 7114509697 | ||
|  | 6a6ebd0c60 | ||
|  | 7a41ca4187 | ||
|  | 469bcd769c | ||
|  | 598cbeec9d | ||
|  | 20ce7bcfc3 | ||
|  | 1bbf1e4270 | ||
|  | 84b901c8b3 | ||
|  | e3f3d5d3b7 | ||
|  | 68ac7a0a6d | ||
|  | 8da96590ac | ||
|  | fea7aaaff6 | ||
|  | fb2bdfe543 | ||
|  | 3347fa7c25 | ||
|  | f776756205 | ||
|  | 59233d8019 | ||
|  | 35551f69c1 | ||
|  | 85dcae1baf | ||
|  | 99eba86794 | ||
|  | 646e02ca9c | 
| @@ -1,2 +1,2 @@ | ||||
| [defaults] | ||||
| hostfile = hosts | ||||
| inventory = merlin | ||||
|   | ||||
							
								
								
									
										14
									
								
								gcc-site.yml
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								gcc-site.yml
									
									
									
									
									
								
							| @@ -1,14 +0,0 @@ | ||||
| --- | ||||
| - include: common.yml | ||||
| - include: rabbitmq.yml | ||||
| - include: memcached.yml | ||||
| - include: mariadb.yml | ||||
| - include: keystone.yml | ||||
| - include: glance-controller.yml | ||||
| - include: nova-controller.yml | ||||
| - include: neutron-controller.yml | ||||
| - include: cinder-controller.yml | ||||
| - include: cinder-storage.yml | ||||
| - include: nova-compute.yml | ||||
| - include: horizon.yml | ||||
| - include: gcc-post-install.yml | ||||
							
								
								
									
										21
									
								
								hosts
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								hosts
									
									
									
									
									
								
							| @@ -1,5 +1,9 @@ | ||||
| # A demo cluster of three nodes. | ||||
|  | ||||
| [databases] | ||||
| openstack01-node01 | ||||
| openstack01-node02 | ||||
| openstack01-node03 | ||||
|  | ||||
| [keystone] | ||||
| openstack01-node03 | ||||
| @@ -15,24 +19,9 @@ openstack01-node01 | ||||
| openstack01-node02 | ||||
| openstack01-node03 | ||||
|  | ||||
| #[cassandra] | ||||
| #openstack01-node[01:03] | ||||
|  | ||||
| #openstack01-node01 | ||||
| # | ||||
| #[next_cassandra] | ||||
| #openstack01-node02 | ||||
| #openstack01-node03 | ||||
|  | ||||
| [memcached] | ||||
| openstack01-node03 | ||||
|  | ||||
| #[first_cassandra:vars] | ||||
| #run_options="" | ||||
| # | ||||
| #[next_cassandra:vars] | ||||
| #run_options="-e CASSANDRA_SEEDS=172.23.41.1" | ||||
|  | ||||
| [neutron-controller] | ||||
| openstack01-node01 physical_interface_mappings=provider:ens192 | ||||
|  | ||||
| @@ -46,4 +35,4 @@ openstack01-node03 | ||||
| openstack01-node01 storage_volume=/dev/loop0 | ||||
|  | ||||
| [nova-compute] | ||||
| openstack01-node04 physical_interface_mappings=provider:dummy0 | ||||
| openstack01-node04 physical_interface_mappings=provider:enp4s0f0 | ||||
|   | ||||
							
								
								
									
										39
									
								
								merlin
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										39
									
								
								merlin
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,39 @@ | ||||
| [nova-compute] | ||||
| merlin-node012 physical_interface_mappings=provider:enp129s0f1 overlay_ip=172.23.43.12 | ||||
| merlin-node013 physical_interface_mappings=provider:enp129s0f1 overlay_ip=172.23.43.13 | ||||
| merlin-node006 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.6 | ||||
| merlin-node007 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.7 | ||||
| merlin-node008 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.8 | ||||
| merlin-node009 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.9 | ||||
| merlin-node010 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.10 | ||||
|  | ||||
| [databases] | ||||
| merlin-node011 | ||||
| merlin-node012 | ||||
| merlin-node013 | ||||
|  | ||||
| [rabbitmq] | ||||
| merlin-node011 | ||||
| merlin-node012 | ||||
| merlin-node013 | ||||
|  | ||||
| [horizon] | ||||
| merlin-node011 | ||||
|  | ||||
| [memcached] | ||||
| merlin-node011 | ||||
|  | ||||
| [nova-controller] | ||||
| merlin-node011 | ||||
|  | ||||
| [keystone] | ||||
| merlin-node011 | ||||
|  | ||||
| [neutron-controller] | ||||
| merlin-node011 physical_interface_mappings=provider:enp129s0f1 overlay_ip=172.23.43.11 | ||||
|  | ||||
| [heat] | ||||
| merlin-node011 | ||||
|  | ||||
| [glance-controller] | ||||
| merlin-node011 | ||||
							
								
								
									
										39
									
								
								merlin-bagpipe
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										39
									
								
								merlin-bagpipe
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,39 @@ | ||||
| [nova-compute] | ||||
| merlin-managementnode002 physical_interface_mappings=provider:enp5s0f1 overlay_ip=129.125.60.109 | ||||
| merlin-managementnode003 physical_interface_mappings=provider:enp5s0f1 overlay_ip=129.125.60.110 | ||||
| merlin-node001 physical_interface_mappings=provider:enp130s0f0 overlay_ip=129.125.60.117 | ||||
| merlin-node002 physical_interface_mappings=provider:enp130s0f0 overlay_ip=129.125.60.118 | ||||
| merlin-node003 physical_interface_mappings=provider:enp130s0f0 overlay_ip=129.125.60.119 | ||||
| merlin-node004 physical_interface_mappings=provider:enp130s0f0 overlay_ip=129.125.60.122 | ||||
| merlin-node005 physical_interface_mappings=provider:enp130s0f0 overlay_ip=129.125.60.123 | ||||
|  | ||||
| [databases] | ||||
| merlin-managementnode001 | ||||
| merlin-managementnode002 | ||||
| merlin-managementnode003 | ||||
|  | ||||
| [rabbitmq] | ||||
| merlin-managementnode001 | ||||
| merlin-managementnode002 | ||||
| merlin-managementnode003 | ||||
|  | ||||
| [horizon] | ||||
| merlin-managementnode001 | ||||
|  | ||||
| [memcached] | ||||
| merlin-managementnode001 | ||||
|  | ||||
| [nova-controller] | ||||
| merlin-managementnode001 | ||||
|  | ||||
| [keystone] | ||||
| merlin-managementnode001 | ||||
|  | ||||
| [neutron-controller] | ||||
| merlin-managementnode001 physical_interface_mappings=provider:enp5s0f1 overlay_ip=129.125.60.108 | ||||
|  | ||||
| [heat] | ||||
| merlin-managementnode001 | ||||
|  | ||||
| [glance-controller] | ||||
| merlin-managementnode001 | ||||
							
								
								
									
										21
									
								
								nuke.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								nuke.yml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,21 @@ | ||||
| --- | ||||
| # This playbook will reset the instalation to facilitate a new installation. | ||||
| # All data is lost! | ||||
| - hosts: all | ||||
|   become: True | ||||
|   name: Dummy to gather facts | ||||
|   tasks: | ||||
|     - name: Stop docker service | ||||
|       shell: "systemctl stop docker" | ||||
|     - name: Verify docker is stopped. | ||||
|       systemd: | ||||
|         name: docker | ||||
|         state: stopped | ||||
|     - name: remove volumes | ||||
|       shell: "rm -rf /srv" | ||||
|  | ||||
| - hosts: cinder-storage | ||||
|   become: True | ||||
|   tasks: | ||||
|     - name: wipe cinder storage. | ||||
|       shell: "dd if=/dev/zero of={{ storage_volume }} bs=1M count=1 && sync" | ||||
| @@ -16,10 +16,7 @@ | ||||
|       command: docker exec -i keystone.service bash -c "source /root/admin-openrc.sh && {{ item }}" | ||||
|       with_items: | ||||
|         - openstack network create  --share --external  --provider-physical-network provider  --provider-network-type flat provider | ||||
|         - > | ||||
|             openstack subnet create --network provider | ||||
|             --allocation-pool start={{ allocation_pool['start'] }},end={{ allocation_pool['end'] }} | ||||
|             --dns-nameserver {{ dns_nameserver }} --gateway {{ gateway }} --subnet-range {{ subnet_range }} providersub | ||||
|         - openstack network set --external provider | ||||
|         - openstack flavor create --id 0 --vcpus 1 --ram 64 --disk 1 m1.nano | ||||
|         - openstack keypair create --public-key /root/id_rsa.pub adminkey | ||||
|  | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| [Unit] | ||||
| Description=Openstack Glance Container | ||||
| Description=Openstack Horizon Container | ||||
| After=docker.service | ||||
| Requires=docker.service | ||||
|  | ||||
|   | ||||
| @@ -52,7 +52,7 @@ | ||||
|   delay: 3 | ||||
|   ignore_errors: yes | ||||
|  | ||||
| - name: keystone manage commands to setup db | ||||
| - name: keystone manage commands to setup db_sync | ||||
|   command: > | ||||
|              /usr/bin/docker run --rm | ||||
|              --add-host=mariadb:{{ listen_ip | default(hostvars[groups['databases'][0]]['ansible_default_ipv4']['address']) }} | ||||
| @@ -69,6 +69,11 @@ | ||||
|                     --bootstrap-internal-url http://{{ listen_ip | default(hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address']) }}:35357/v3/ | ||||
|                     --bootstrap-public-url http://{{ listen_ip | default(hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address']) }}:5000/v3/ | ||||
|                     --bootstrap-region-id RegionOne | ||||
|   # sometimes the initial connect fails. | ||||
|   # Retry until it succeeds. | ||||
|   retries: 7 | ||||
|   delay: 3 | ||||
|   ignore_errors: yes | ||||
|  | ||||
| - name: make sure service is started | ||||
|   systemd: | ||||
| @@ -85,12 +90,19 @@ | ||||
|              -e "OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3" | ||||
|              -e "OS_PASSWORD={{ secrets['OS_PASSWORD'] }}" | ||||
|              {{ docker_image }} bash /etc/bootstrap.sh | ||||
|   register: result | ||||
|   retries: 7 | ||||
|   delay: 3 | ||||
|  | ||||
|  | ||||
| - name: install openstack repo key host. | ||||
|   command: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5EDB1B62EC4926EA | ||||
|   tags: openstackclient | ||||
|  | ||||
| - name: install openstack repo on host. | ||||
|   command: > | ||||
|       echo "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" > /etc/apt/sources.list.d/ocata.list && | ||||
|       apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5EDB1B62EC4926EA | ||||
|   apt_repository: | ||||
|       repo: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" | ||||
|       filename: ocata | ||||
|   tags: openstackclient | ||||
|  | ||||
| - name: install openstack client for management | ||||
|   | ||||
| @@ -70,3 +70,8 @@ | ||||
|  | ||||
| - name: start service at boot. | ||||
|   command: systemctl reenable mysql.service | ||||
|  | ||||
| - name: Give the cluster some time to initialize replication. | ||||
|   command: bash -c "sleep 60 && systemctl daemon-reload" | ||||
|   when: groups['databases'] | length >= 3 | ||||
|  | ||||
|   | ||||
| @@ -6,7 +6,7 @@ | ||||
|     name: secrets | ||||
|  | ||||
| - set_fact: | ||||
|     docker_image: "registry.webhosting.rug.nl/hpc/openstack-neutron-controller:latest" | ||||
|     docker_image: "registry.webhosting.rug.nl/hpc/openstack-neutron-controller-merlin:latest" | ||||
|  | ||||
| - name: pull docker image | ||||
|   docker_image: | ||||
| @@ -29,6 +29,7 @@ | ||||
|         -e "NOVA_CONTROLLER_HOST={{ listen_ip | default(hostvars[groups['nova-controller'][0]]['ansible_default_ipv4']['address']) }}" | ||||
|         -e "NOVA_PLACEMENT_PASSWORD={{ secrets['NOVA_PLACEMENT_PASSWORD'] }}" | ||||
|         -e "NOVA_PLACEMENT_USER=placement" | ||||
|         -e "OVERLAY_IP={{ overlay_ip }}" | ||||
|         -e "OS_PASSWORD={{ secrets['OS_PASSWORD'] }}" | ||||
|         -e "PHYSICAL_INTERFACE_MAPPINGS={{ physical_interface_mappings }}" | ||||
|         -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}" | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|   tags: vars | ||||
|  | ||||
| - set_fact: | ||||
|     docker_image: registry.webhosting.rug.nl/hpc/openstack-nova-compute:latest | ||||
|     docker_image: registry.webhosting.rug.nl/hpc/openstack-nova-compute-merlin:latest | ||||
|   tags: vars | ||||
|  | ||||
| - name: pull docker image | ||||
|   | ||||
| @@ -26,6 +26,7 @@ ExecStart=/usr/bin/docker run --name %n \ | ||||
|     -e "NOVA_PLACEMENT_PASSWORD={{ secrets['NOVA_PLACEMENT_PASSWORD'] }}" \ | ||||
|     -e "NOVA_PLACEMENT_USER=placement" \ | ||||
|     -e "NOVA_USER=nova" \ | ||||
|     -e "OVERLAY_IP={{ overlay_ip }}" \ | ||||
|     -e "OS_PASSWORD={{ secrets['OS_PASSWORD'] }}" \ | ||||
|     -e "PHYSICAL_INTERFACE_MAPPINGS={{ physical_interface_mappings }}" \ | ||||
|     -e "RABBIT_HOST={{ hostvars[groups['rabbitmq'][0]]['listen_ip'] | default(hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address']) }}" \ | ||||
|   | ||||
							
								
								
									
										60
									
								
								secrets.yml
									
									
									
									
									
								
							
							
						
						
									
										60
									
								
								secrets.yml
									
									
									
									
									
								
							| @@ -1,30 +1,32 @@ | ||||
| $ANSIBLE_VAULT;1.1;AES256 | ||||
| 35643437313834633532373265366630663035336231306639623561613765386332663334343237 | ||||
| 3339363162303463353437326331656532336138373066620a623137643762383532376361353364 | ||||
| 37646236386466353636396535376463333133323664316634663466663164303063383830653039 | ||||
| 3535666361303562630a316137376531636537383138663662373865383431343035646539356137 | ||||
| 38323866643831353537366630363333663865383261633938346664633362343661343839383766 | ||||
| 66363733356333303334323136376136353738376362376231353338343763663131363731343639 | ||||
| 61383138626235633663666430383964616239363035663663646133636434363032626633663865 | ||||
| 30663732646630393163653461626435333463396463333236313930346461626364626166386365 | ||||
| 66323736316230376165666366363136666533376335316132343361393532616536383965363339 | ||||
| 30376362356665633630393561653532613139366236663961643864383738353430666562623730 | ||||
| 34663166393665653265663836623731386235633062306562373935633737363639383336303539 | ||||
| 37663763623664623038316438356138363134646230643261646262353163333430616462393866 | ||||
| 31666233636233356464633436626637313633623736343264613037353432386131393964386663 | ||||
| 36353236613662633764366437306461316138366461653731373436613039346663663536653362 | ||||
| 38656636303935626563303732666261373665303035333661643865393166653330646336393961 | ||||
| 31646539396131626464313733383638656438613530663166393035343630353764313232323432 | ||||
| 34386334666231323261343765623636313032373835396332623037613866613636393038653266 | ||||
| 36336531356534633933383432646663663364376130386239613836336263623161326563346661 | ||||
| 33636232313866613662353661373533383138393434396338343934326333326238336638396462 | ||||
| 65376133343038313437343934373265333632663133653133656130636533663237623839623634 | ||||
| 35363764363763363465363437623964363362616261663166633066373033633864336532633031 | ||||
| 32323733616562663031303230383561373637326436336462363461313532623262653866323862 | ||||
| 34643631333533626537373538353564306261313035303530666462326534633638363932363037 | ||||
| 65336230373034643966656561303164373463353638316632613431643535303930373334383134 | ||||
| 38323731363535313065326330653666323934636466386238616664316635303333653631396639 | ||||
| 39303737613361653862343964303231393164346134633366633262326230643137303331373231 | ||||
| 31323832363937663935333737613133323265323863623933633962633230386339636432643937 | ||||
| 66653763376663666637353738646565343835333937343765356539383734316231623466343634 | ||||
| 30663135663938393561333133663737653635393432333534306466366332333338 | ||||
| 32313865346461323861313234623330633830663561353636396161643566353733393931303232 | ||||
| 3134353364393034626564333866383065633162383561390a656463303464616434303435303037 | ||||
| 63313232373630616136626464373464646535353030396136656361343162666165366566383737 | ||||
| 6133326539393432390a386162393639636137326532393939633665326637373461663766656565 | ||||
| 36636661653939373134313165383261353832373362613533366431626330313831643836363932 | ||||
| 38623937663335646134323130636539333335636265313564323032623065393031343235633832 | ||||
| 33336138653336633932383133366566656464356331306265663662356166613135663234326434 | ||||
| 64343765366439303766613062363830346238376435366138323662366463353634623937376663 | ||||
| 39313263613764623533323562333932656564346462333961663538353366313065343263383431 | ||||
| 39643734353632336134663965343062373933656461393264323938303261316563313962343837 | ||||
| 66623562333031646633643734383439386130653033343962633930613031313433633033383561 | ||||
| 65366230663263346661343339636537336332323266623230646534323563373934356332663136 | ||||
| 30626231623534616562323033333437353239306538653835623931363164383536336562336136 | ||||
| 30666265366536313436646535383632626137613831633132666666653830383566323532306332 | ||||
| 34353534336331653330663137323936303337306134333036633932363664643864333534316438 | ||||
| 31623062303137376637353061643838383831663561663436663130663064323665316261316531 | ||||
| 32616533333165636130623334373130316339326538343330646366383933353137623631323530 | ||||
| 39653437343432383161323661643931346664663265326664336461373033646563666333353661 | ||||
| 61633865373764346131623131346266373331626336663735303439376230333537386562303939 | ||||
| 65363139346564653464663633326639323930333464376136353064393039373535613231623138 | ||||
| 61373434323065646238356436373730333939613965666237616265653033333230353466316266 | ||||
| 30383939376335656632626232663061623332636337646234653565363561353334643462376666 | ||||
| 30326438303333336265306463313137656334313235643434616238333564373761333235633639 | ||||
| 66346161316130633463623435646639366136386335386139613230653064663230366265633036 | ||||
| 33613132633035393337653436613031383765616638323663363866393165613030306637393134 | ||||
| 38333734373939626364343533306662393463646264666161346434363832623239643864303431 | ||||
| 39383931333139633338663761646335613935636239636439383333313531633364653439323036 | ||||
| 35373639363164386666366335313934336231333261623763633133393562656237313761356631 | ||||
| 39663234653339313466326534333435306662316461333035623339353435383137383735373733 | ||||
| 32373535303338646266346539386364356233616631316661633037346665353762353138376538 | ||||
| 386535333439313233663464353534376535 | ||||
|   | ||||
							
								
								
									
										2
									
								
								site.yml
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								site.yml
									
									
									
									
									
								
							| @@ -12,4 +12,4 @@ | ||||
| - include: nova-compute.yml | ||||
| - include: horizon.yml | ||||
| - include: heat.yml | ||||
| - include: post-install.yml | ||||
|   #- include: post-install.yml | ||||
|   | ||||
							
								
								
									
										48
									
								
								test_hosts
									
									
									
									
									
								
							
							
						
						
									
										48
									
								
								test_hosts
									
									
									
									
									
								
							| @@ -1,36 +1,48 @@ | ||||
| [databases] | ||||
| ansible-test | ||||
| ansible-test-2 | ||||
| ansible-test-3 | ||||
| openstack-test05 | ||||
| openstack-test06 | ||||
| openstack-test07 | ||||
|  | ||||
| [keystone] | ||||
| ansible-test-3 | ||||
| openstack-test05 | ||||
|  | ||||
| [glance-controller] | ||||
| ansible-test-2 | ||||
| openstack-test05 | ||||
|  | ||||
| [horizon] | ||||
| ansible-test-3 | ||||
| openstack-test05 | ||||
|  | ||||
| [rabbitmq] | ||||
| ansible-test | ||||
| ansible-test-2 | ||||
| ansible-test-3 | ||||
|  | ||||
| [cinder-storage] | ||||
| ansible-test | ||||
| openstack-test05 | ||||
| openstack-test06 | ||||
| openstack-test07 | ||||
|  | ||||
| [memcached] | ||||
| ansible-test-3 | ||||
| openstack-test05 | ||||
|  | ||||
| [neutron-controller] | ||||
| ansible-test physical_interface_mappings=provider:ens10 | ||||
| openstack-test05 physical_interface_mappings=provider:enp4s0f0 | ||||
|  | ||||
| [nova-controller] | ||||
| ansible-test | ||||
| openstack-test05 | ||||
|  | ||||
| [nova-compute] | ||||
| ansible-test-2 physical_interface_mappings=provider:ens10 | ||||
| [cinder-controller] | ||||
| openstack-test05 | ||||
|  | ||||
| [heat] | ||||
| ansible-test | ||||
| openstack-test05 | ||||
|  | ||||
| [cinder-storage] | ||||
| openstack-test05 storage_volume=/dev/openstack-test05-vg/cinder | ||||
| openstack-test06 storage_volume=/dev/openstack-test06-vg/cinder | ||||
| openstack-test07 storage_volume=/dev/openstack-test07-vg/cinder | ||||
| openstack-test08 storage_volume=/dev/openstack-test08-vg/cinder | ||||
| openstack-test09 storage_volume=/dev/openstack-test09-vg/cinder | ||||
| openstack-test10 storage_volume=/dev/openstack-test10-vg/cinder | ||||
|  | ||||
| [nova-compute] | ||||
| openstack-test06 physical_interface_mappings=provider:enp4s0f0 | ||||
| openstack-test07 physical_interface_mappings=provider:enp4s0f0 | ||||
| openstack-test08 physical_interface_mappings=provider:enp4s0f0 | ||||
| openstack-test09 physical_interface_mappings=provider:enp4s0f0 | ||||
| openstack-test10 physical_interface_mappings=provider:enp4s0f0 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user