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=provider:eno3
-merlin-managementnode003 physical_interface_mappings=provider:eno3
-merlin-node001 physical_interface_mappings=provider:eno3
-merlin-node003 physical_interface_mappings=provider:eno3
-merlin-node004 physical_interface_mappings=provider:eno3
+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-managementnode001
-merlin-managementnode002
-merlin-managementnode003
+merlin-node011
+merlin-node012
+merlin-node013
 
 [rabbitmq]
-merlin-managementnode001
-merlin-managementnode002
-merlin-managementnode003
+merlin-node011
+merlin-node012
+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=provider: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

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

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']) }}
@@ -90,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

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

site.yml

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