Merge "Delete OVN MAC addr ports prior to deleting stack"
This commit is contained in:
commit
86bf64c209
|
@ -68,3 +68,4 @@ mock_modules:
|
||||||
- tripleo_overcloud_network_vip_extract
|
- tripleo_overcloud_network_vip_extract
|
||||||
- tripleo_overcloud_network_vip_provision
|
- tripleo_overcloud_network_vip_provision
|
||||||
- tripleo_overcloud_network_vip_populate_environment
|
- tripleo_overcloud_network_vip_populate_environment
|
||||||
|
- tripleo_ovn_mac_addresses
|
||||||
|
|
|
@ -230,7 +230,7 @@ def run_module():
|
||||||
stack = module.params.get('stack_name', 'overcloud')
|
stack = module.params.get('stack_name', 'overcloud')
|
||||||
role_name = module.params['role_name']
|
role_name = module.params['role_name']
|
||||||
bridge_mappings = module.params['ovn_bridge_mappings']
|
bridge_mappings = module.params['ovn_bridge_mappings']
|
||||||
servers = module.params['server_resource_names']
|
servers = module.params.get('server_resource_names') or []
|
||||||
playbook_dir = module.params['playbook_dir']
|
playbook_dir = module.params['playbook_dir']
|
||||||
concurrency = module.params.get('concurrency', 0)
|
concurrency = module.params.get('concurrency', 0)
|
||||||
static_mappings = module.params.get(
|
static_mappings = module.params.get(
|
||||||
|
@ -250,8 +250,9 @@ def run_module():
|
||||||
module.exit_json(**result)
|
module.exit_json(**result)
|
||||||
|
|
||||||
net_id = create_ovn_mac_address_network(result, conn)
|
net_id = create_ovn_mac_address_network(result, conn)
|
||||||
tags = ['tripleo_stack_name={}'.format(stack),
|
tags = ['tripleo_stack_name={}'.format(stack)]
|
||||||
'tripleo_role={}'.format(role_name)]
|
if role_name:
|
||||||
|
tags.append('tripleo_role={}'.format(role_name))
|
||||||
|
|
||||||
# no limit on concurrency, create a worker for every server
|
# no limit on concurrency, create a worker for every server
|
||||||
if concurrency < 1:
|
if concurrency < 1:
|
||||||
|
|
|
@ -34,6 +34,9 @@
|
||||||
tripleo_service_vip:
|
tripleo_service_vip:
|
||||||
stack_name: "{{ stack_name }}"
|
stack_name: "{{ stack_name }}"
|
||||||
state: absent
|
state: absent
|
||||||
|
- name: Delete OVN MAC Address ports
|
||||||
|
tripleo_ovn_mac_addresses:
|
||||||
|
stack: "{{ stack_name }}"
|
||||||
- name: Delete heat stack
|
- name: Delete heat stack
|
||||||
openstack.cloud.stack:
|
openstack.cloud.stack:
|
||||||
name: "{{ stack_name }}"
|
name: "{{ stack_name }}"
|
||||||
|
|
Loading…
Reference in New Issue