Merge "Fixes mgmt net and flavor fact setting"
This commit is contained in:
commit
1092950508
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user