Shouldn't be here in the first place.

gcc-site.yml

@@ -1,14 +0,0 @@
----
-- import_tasks: common.yml
-- import_tasks: rabbitmq.yml
-- import_tasks: memcached.yml
-- import_tasks: mariadb.yml
-- import_tasks: keystone.yml
-- import_tasks: glance-controller.yml
-- import_tasks: nova-controller.yml
-- import_tasks: neutron-controller.yml
-- import_tasks: cinder-controller.yml
-- import_tasks: cinder-storage.yml
-- import_tasks: nova-compute.yml
-- import_tasks: horizon.yml
-- import_tasks: gcc-post-install.yml

merlin

@@ -1,37 +1,39 @@
 [nova-compute]
-merlin-managementnode002 physical_interface_mappings=provider:eno3
+merlin-node012 physical_interface_mappings=provider:enp129s0f1 overlay_ip=172.23.43.12
-merlin-managementnode003 physical_interface_mappings=provider:eno3
+merlin-node013 physical_interface_mappings=provider:enp129s0f1 overlay_ip=172.23.43.13
-merlin-node001 physical_interface_mappings=provider:eno3
+merlin-node006 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.6
-merlin-node003 physical_interface_mappings=provider:eno3
+merlin-node007 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.7
-merlin-node004 physical_interface_mappings=provider: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=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 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/common/tasks/main.yml

@@ -5,7 +5,7 @@
 - name: Passwordless sudo for admins
   lineinfile: dest=/etc/sudoers line="%admin  ALL=(ALL:ALL) NOPASSWD:ALL"
 
-- import_tasks: users.yml
+- include: users.yml
 
 - name: common | install packages
   apt: pkg={{ item }} state=latest update_cache=yes
@@ -26,4 +26,4 @@
     owner: root
     group: root
 
-- import_tasks: docker.yml
+- include: docker.yml

roles/keystone/tasks/main.yml

@@ -94,7 +94,8 @@
   retries: 7
   delay: 3
 
-- name: install openstack repo host key.
+
+- name: install openstack repo key host.
   command: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5EDB1B62EC4926EA
   tags: openstackclient
 

roles/mariadb/tasks/main.yml

@@ -11,9 +11,9 @@
     state: directory
     mode: 0777
   with_items:
-    - /srv/mariadb/lib/mysql
+      - /srv/mariadb/lib/mysql
-    - /srv/mariadb/etc/mysql
+      - /srv/mariadb/etc/mysql
-    - /srv/mariadb/etc/mysql/conf.d
+      - /srv/mariadb/etc/mysql/conf.d
 
 - name: place settings file
   copy:
@@ -21,14 +21,12 @@
     dest: /srv/mariadb/etc/mysql/conf.d/my.cnf
     mode: 660
 
-- name: >
+- name: Set galara.cnf on node if we have at least three nodes.
-        Set galara.cnf on node if we have at least three nodes.
-        And we're part of the cluster.
   template:
     src: files/galera.cnf
     dest: /srv/mariadb/etc/mysql/conf.d/galera.cnf
     mode: 660
-  when: "'databases' in group_names and groups['databases'] | length >= 3"
+  when: groups['databases'] | length >= 3
 
   # This mimics galera_new_cluster.sh
 - name: Initialize a new cluster.
@@ -49,8 +47,7 @@
         name: mysql.service
         state: started
 
-  when: "'databases' in group_names and groups['databases'] \
+  when: groups['databases'] | length >= 3 and ansible_hostname == hostname_node0
-         | length >= 3 and ansible_hostname == hostname_node0"
 
 - name: install service file.
   block:
@@ -64,22 +61,17 @@
         group: root
 
 - name: Give the master node some time to initialize the cluster.
-  command: bash -c "sleep 60"
+  command: bash -c "sleep 60 && systemctl daemon-reload"
-  when: "'databases' in group_names and groups['databases'] \
-         | length >= 3"
-
-- name: Daemon reload (the implicit doesn't work)
-  command: bash -c "systemctl daemon-reload"
 
 - name: make sure service is started
   systemd:
     name: mysql.service
     state: started
-    daemon_reload: yes
 
 - 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: "'databases' in group_names and groups['databases'] | length >= 3"
+  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

@@ -1,15 +1,15 @@
 ---
-- import_playbook: common.yml
+- include: common.yml
-- import_playbook: rabbitmq.yml
+- include: rabbitmq.yml
-- import_playbook: memcached.yml
+- include: memcached.yml
-- import_playbook: mariadb.yml
+- include: mariadb.yml
-- import_playbook: keystone.yml
+- include: keystone.yml
-- import_playbook: glance-controller.yml
+- include: glance-controller.yml
-- import_playbook: nova-controller.yml
+- include: nova-controller.yml
-- import_playbook: neutron-controller.yml
+- include: neutron-controller.yml
-- import_playbook: cinder-controller.yml
+- include: cinder-controller.yml
-- import_playbook: cinder-storage.yml
+- include: cinder-storage.yml
-- import_playbook: nova-compute.yml
+- include: nova-compute.yml
-- import_playbook: horizon.yml
+- include: horizon.yml
-- import_playbook: heat.yml
+- include: heat.yml
-- import_playbook: post-install.yml
+  #- include: post-install.yml