Shouldn't be here in the first place.

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

merlin

@@ -1,37 +1,39 @@
 [nova-compute]
-merlin-managementnode002 physical_interface_mappings=eno3
+merlin-node012 physical_interface_mappings=provider:enp129s0f1 overlay_ip=172.23.43.12
-merlin-managementnode003 physical_interface_mappings=eno3
+merlin-node013 physical_interface_mappings=provider:enp129s0f1 overlay_ip=172.23.43.13
-merlin-node001 physical_interface_mappings=eno3
+merlin-node006 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.6
-merlin-node003 physical_interface_mappings=eno3
+merlin-node007 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.7
-merlin-node004 physical_interface_mappings=eno3
+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-managementnode001
+merlin-node011
-merlin-managementnode002
+merlin-node012
-merlin-managementnode003
+merlin-node013
 
 [rabbitmq]
-merlin-managementnode001
+merlin-node011
-merlin-managementnode002
+merlin-node012
-merlin-managementnode003
+merlin-node013
 
 [horizon]
-merlin-managementnode001
+merlin-node011
 
 [memcached]
-merlin-managementnode001
+merlin-node011
 
 [nova-controller]
-merlin-managementnode001
+merlin-node011
 
 [keystone]
-merlin-managementnode001
+merlin-node011
 
 [neutron-controller]
-merlin-managementnode001 physical_interface_mappings=eno3
+merlin-node011 physical_interface_mappings=provider:enp129s0f1 overlay_ip=172.23.43.11
 
 [heat]
-merlin-managementnode001
+merlin-node011
 
 [glance-controller]
-merlin-managementnode001
+merlin-node011

merlin-bagpipe

@@ -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

nuke.yml

@@ -1,8 +1,13 @@
 ---
+# 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
@@ -10,6 +15,7 @@
       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"

post-install.yml

@@ -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 network set --external 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 flavor create --id 0 --vcpus 1 --ram 64 --disk 1 m1.nano
         - openstack keypair create --public-key /root/id_rsa.pub adminkey
 

roles/horizon/templates/horizon.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Openstack Glance Container
+Description=Openstack Horizon Container
 After=docker.service
 Requires=docker.service
 

roles/keystone/tasks/main.yml

@@ -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: >
+  apt_repository:
-      echo "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" > /etc/apt/sources.list.d/ocata.list &&
+      repo: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
-      apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5EDB1B62EC4926EA
+      filename: ocata
   tags: openstackclient
 
 - name: install openstack client for management

roles/mariadb/tasks/main.yml

@@ -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
+

roles/neutron-controller/tasks/main.yml

@@ -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'] }}"

roles/nova-compute/tasks/main.yml

@@ -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

roles/nova-compute/templates/nova-compute.service

@@ -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']) }}" \

secrets.yml

@@ -1,32 +1,32 @@
 $ANSIBLE_VAULT;1.1;AES256
-35616361313539616462356335646363623938366465306461313030373933636533346262363934
+32313865346461323861313234623330633830663561353636396161643566353733393931303232
-3363636363313264626338666264303736626566623738300a363034653230613037656634616464
+3134353364393034626564333866383065633162383561390a656463303464616434303435303037
-35613639633237616232306336373436616230636536313566386131636566623436313061396637
+63313232373630616136626464373464646535353030396136656361343162666165366566383737
-6537343234333636320a356466393539616234613766623635333132636566303732663166396365
+6133326539393432390a386162393639636137326532393939633665326637373461663766656565
-35343063393438306435653331386232396132613239383130646637623839313530376534333434
+36636661653939373134313165383261353832373362613533366431626330313831643836363932
-39636465636361353937613133366239666462633735643438623139383438616431323332363464
+38623937663335646134323130636539333335636265313564323032623065393031343235633832
-62373463393531636561326532663737653236316663383838636564646264353663343736306663
+33336138653336633932383133366566656464356331306265663662356166613135663234326434
-38383866383466313864623037313663313334666261653330613763653562366163323436336466
+64343765366439303766613062363830346238376435366138323662366463353634623937376663
-64616133643862316339626266326434626339646461356235333062623665376534306533623839
+39313263613764623533323562333932656564346462333961663538353366313065343263383431
-36646661326133613435663066386430346333326164643138396130313138376566393539656665
+39643734353632336134663965343062373933656461393264323938303261316563313962343837
-39643134383663613761613839656362623932316235643138326332623934373733326364313762
+66623562333031646633643734383439386130653033343962633930613031313433633033383561
-62643030336230646530346233653334663936333965616263613236663238663031336331323664
+65366230663263346661343339636537336332323266623230646534323563373934356332663136
-38653466623734373735666330303636663965663633376461303464353138393233653864623231
+30626231623534616562323033333437353239306538653835623931363164383536336562336136
-39343539343136313736393838333563346534336430393436663634643364643264373237313862
+30666265366536313436646535383632626137613831633132666666653830383566323532306332
-35313035666133393535383630663635313533653534626661613465636236306462346632656437
+34353534336331653330663137323936303337306134333036633932363664643864333534316438
-65383839616263373462323737316263373161353036366162633366326565663035663862393463
+31623062303137376637353061643838383831663561663436663130663064323665316261316531
-32623466653237663538626238613264656631633830666435343264343338333934356662323761
+32616533333165636130623334373130316339326538343330646366383933353137623631323530
-66666566353838633334316336396338666332343730626130396435363131363834363436343066
+39653437343432383161323661643931346664663265326664336461373033646563666333353661
-30663137646561616665643636326665343535653937386566663364353761633061366134356561
+61633865373764346131623131346266373331626336663735303439376230333537386562303939
-31363831316636353732316134623835643936326636373635376539666531313664306663306362
+65363139346564653464663633326639323930333464376136353064393039373535613231623138
-30643038396261366335626335366661613063626361323933663364373564623238663265646361
+61373434323065646238356436373730333939613965666237616265653033333230353466316266
-39653330306562646164343836316336363534303139663335333862646633343434333336613564
+30383939376335656632626232663061623332636337646234653565363561353334643462376666
-66346434626538306462623463666132356539613962646437366436666434613764613331303566
+30326438303333336265306463313137656334313235643434616238333564373761333235633639
-37306531326434666666616630336232343937393066316565653539396664353139643330633764
+66346161316130633463623435646639366136386335386139613230653064663230366265633036
-39343036626366316339353737383561323532343965633536633964366235396530316462316331
+33613132633035393337653436613031383765616638323663363866393165613030306637393134
-38343338303764636331363436616530316564383233643962343539363564326465663434386262
+38333734373939626364343533306662393463646264666161346434363832623239643864303431
-30666465636337636335303864373836363561623036363939326161313430366162663839343739
+39383931333139633338663761646335613935636239636439383333313531633364653439323036
-35393630666139383035613462653630393133656265613665363939636539393834396333396538
+35373639363164386666366335313934336231333261623763633133393562656237313761356631
-33633330353163386430353038656431643763626263383764636237303133383033666537306235
+39663234653339313466326534333435306662316461333035623339353435383137383735373733
-36343139643164626562616563643562313865396464616336353432613639633264336639383236
+32373535303338646266346539386364356233616631316661633037346665353762353138376538
-373735393064636436326435643962383864
+386535333439313233663464353534376535

site.yml

@@ -12,4 +12,4 @@
 - include: nova-compute.yml
 - include: horizon.yml
 - include: heat.yml
-- include: post-install.yml
+  #- include: post-install.yml

test_hosts

@@ -1,36 +1,48 @@
 [databases]
-ansible-test
+openstack-test05
-ansible-test-2
+openstack-test06
-ansible-test-3
+openstack-test07
 
 [keystone]
-ansible-test-3
+openstack-test05
 
 [glance-controller]
-ansible-test-2
+openstack-test05
 
 [horizon]
-ansible-test-3
+openstack-test05
 
 [rabbitmq]
-ansible-test
+openstack-test05
-ansible-test-2
+openstack-test06
-ansible-test-3
+openstack-test07
-
-[cinder-storage]
-ansible-test
 
 [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]
+[cinder-controller]
-ansible-test-2 physical_interface_mappings=provider:ens10
+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