From 20ce7bcfc359ae646ccf6e1d4f90cde613556b96 Mon Sep 17 00:00:00 2001 From: Egon Rijpkema Date: Tue, 20 Feb 2018 15:28:54 +0100 Subject: [PATCH] set overlay ip --- merlin | 12 ++++++------ roles/neutron-controller/tasks/main.yml | 3 ++- roles/nova-compute/tasks/main.yml | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/merlin b/merlin index de64a30..19976e9 100644 --- a/merlin +++ b/merlin @@ -1,9 +1,9 @@ [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-managementnode002 physical_interface_mappings=provider:enp5s0f1 overlay_ip=172.23.43.102 +merlin-managementnode003 physical_interface_mappings=provider:enp5s0f1 overlay_ip=172.23.43.103 +merlin-node001 physical_interface_mappings=provider:enp130s0f1 overlay_ip=172.23.43.1 +merlin-node003 physical_interface_mappings=provider:enp130s0f1 overlay_ip=172.23.43.3 +merlin-node002 physical_interface_mappings=provider:enp130s0f1 overlay_ip=172.23.43.2 [databases] merlin-managementnode001 @@ -28,7 +28,7 @@ merlin-managementnode001 merlin-managementnode001 [neutron-controller] -merlin-managementnode001 physical_interface_mappings=provider:eno3 +merlin-managementnode001 physical_interface_mappings=provider:enp5s0f1 overlay_ip=172.23.43.101 [heat] merlin-managementnode001 diff --git a/roles/neutron-controller/tasks/main.yml b/roles/neutron-controller/tasks/main.yml index b14e101..f12959f 100644 --- a/roles/neutron-controller/tasks/main.yml +++ b/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'] }}" diff --git a/roles/nova-compute/tasks/main.yml b/roles/nova-compute/tasks/main.yml index 5902f81..6d090a4 100644 --- a/roles/nova-compute/tasks/main.yml +++ b/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