Ensure installation of same openstack client

merlin

@@ -1,9 +1,9 @@
 [nova-compute]
-merlin-managementnode002 physical_interface_mappings=provider:enp5s0f1 overlay_ip=172.23.43.102
+merlin-managementnode002 physical_interface_mappings=provider:eno3
-merlin-managementnode003 physical_interface_mappings=provider:enp5s0f1 overlay_ip=172.23.43.103
+merlin-managementnode003 physical_interface_mappings=provider:eno3
-merlin-node001 physical_interface_mappings=provider:enp130s0f1 overlay_ip=172.23.43.1
+merlin-node001 physical_interface_mappings=provider:eno3
-merlin-node003 physical_interface_mappings=provider:enp130s0f1 overlay_ip=172.23.43.3
+merlin-node003 physical_interface_mappings=provider:eno3
-merlin-node002 physical_interface_mappings=provider:enp130s0f1 overlay_ip=172.23.43.2
+merlin-node004 physical_interface_mappings=provider:eno3
 
 [databases]
 merlin-managementnode001
@@ -28,7 +28,7 @@ merlin-managementnode001
 merlin-managementnode001
 
 [neutron-controller]
-merlin-managementnode001 physical_interface_mappings=provider:enp5s0f1 overlay_ip=172.23.43.101
+merlin-managementnode001 physical_interface_mappings=provider:eno3
 
 [heat]
 merlin-managementnode001

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']) }}
@@ -93,13 +93,15 @@
   register: result
   retries: 7
   delay: 3
-  ignore_errors: yes
 
+- name: install openstack repo host key.
+  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/neutron-controller/tasks/main.yml

@@ -6,7 +6,7 @@
     name: secrets
 
 - set_fact:
-    docker_image: "registry.webhosting.rug.nl/hpc/openstack-neutron-controller-merlin:latest"
+    docker_image: "registry.webhosting.rug.nl/hpc/openstack-neutron-controller:latest"
 
 - name: pull docker image
   docker_image:
@@ -29,7 +29,6 @@
         -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-merlin:latest
+    docker_image: registry.webhosting.rug.nl/hpc/openstack-nova-compute:latest
   tags: vars
 
 - name: pull docker image