From 74bfb1c1f29eb37d6e1883fa384a577b19853de8 Mon Sep 17 00:00:00 2001 From: German Eichberger Date: Fri, 16 Mar 2018 10:40:18 -0700 Subject: [PATCH] Fixes mgmt net and flavor fact setting This will fix the management network and flavor fact setting which is not shared among multiple hosts during install. Closes-Bug: 1755929 Change-Id: I3b056b1ac7b7770926a79597744cbb48ef99fe63 (cherry picked from commit 758087197fc39577388c24cb375071e915166227) --- tasks/main.yml | 2 -- tasks/octavia_flavor_create.yml | 1 + tasks/octavia_mgmt_network.yml | 8 ++++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 32b52be3..3160dc37 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -55,7 +55,6 @@ - include: octavia_mgmt_network.yml when: - - inventory_hostname == groups['octavia_all'][0] - octavia_neutron_management_network_uuid is not defined - octavia_neutron_management_network_name is defined tags: @@ -68,7 +67,6 @@ - include: octavia_flavor_create.yml when: - - inventory_hostname == groups['octavia_all'][0] - octavia_nova_flavor_uuid is not defined tags: - octavia-install diff --git a/tasks/octavia_flavor_create.yml b/tasks/octavia_flavor_create.yml index 573ae880..8ce9d458 100644 --- a/tasks/octavia_flavor_create.yml +++ b/tasks/octavia_flavor_create.yml @@ -29,6 +29,7 @@ vcpus: "{{ octavia_amp_vcpu }}" disk: "{{ octavia_amp_disk }}" is_public: False + run_once: True - name: Gather Octavia Flavor Id os_flavor_facts: diff --git a/tasks/octavia_mgmt_network.yml b/tasks/octavia_mgmt_network.yml index 3c8c7478..c2803d54 100644 --- a/tasks/octavia_mgmt_network.yml +++ b/tasks/octavia_mgmt_network.yml @@ -31,7 +31,9 @@ provider_network_type: "{{ octavia_provider_network_type }}" provider_physical_network: "{{ octavia_provider_network_name }}" provider_segmentation_id: "{{ octavia_provider_segmentation_id | default(omit) }}" - when: octavia_service_net_setup + run_once: True + when: + - octavia_service_net_setup - name: Ensure mgmt subnet exists os_subnet: @@ -53,7 +55,9 @@ enable_dhcp: "{{ octavia_management_net_dhcp }}" allocation_pool_start: "{{ octavia_management_net_subnet_allocation_pools.split('-')[0] | default(omit) }}" allocation_pool_end: "{{ octavia_management_net_subnet_allocation_pools.split('-')[1] | default(omit) }}" - when: octavia_service_net_setup + run_once: True + when: + - octavia_service_net_setup - name: Get neutron network os_networks_facts: