Use dynamic_address_fact role from plugins collection
Remove the common-tasks version of this function and instead call a role from the openstack-ansible-plugins collection. Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-plugins/+/923410 Change-Id: I0a99d988df2e05fd6f258ca7ac1dda5fe6c49b77
This commit is contained in:
parent
736d432707
commit
4d1ce1b31d
@ -39,7 +39,8 @@
|
||||
- always
|
||||
|
||||
- name: Determine storage bridge IP address
|
||||
include_tasks: ../common-tasks/dynamic-address-fact.yml
|
||||
include_role:
|
||||
name: openstack.osa.dynamic_address_fact
|
||||
vars:
|
||||
network_address: "storage_address"
|
||||
tags:
|
||||
|
@ -39,7 +39,8 @@
|
||||
- always
|
||||
|
||||
- name: Determine tunnel bridge IP address
|
||||
include_tasks: ../common-tasks/dynamic-address-fact.yml
|
||||
include_role:
|
||||
name: openstack.osa.dynamic_address_fact
|
||||
vars:
|
||||
network_address: "tunnel_address"
|
||||
tags:
|
||||
|
@ -1,38 +0,0 @@
|
||||
---
|
||||
# Copyright 2017, Rackspace US, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- name: Gathering facts for {{ network_address }} interface on metal hosts
|
||||
setup:
|
||||
gather_subset: "!all,network"
|
||||
filter: "{{ dynamic_address_gather_filter | default(('ansible_' ~ default_network_interface_name) | replace('-','_')) }}"
|
||||
vars:
|
||||
default_network_interface_name: "{{ container_networks[network_address]['bridge'] | default }}"
|
||||
when:
|
||||
- is_metal
|
||||
- (dynamic_address_gather_filter is defined) or (default_network_interface_name | length > 0)
|
||||
tags:
|
||||
- common-address
|
||||
- always
|
||||
|
||||
- name: Set IP to use for {{ network_address }}
|
||||
set_fact: "{{ network_address }}={{ hostvars[inventory_hostname] | json_query(query) }}"
|
||||
vars:
|
||||
query: "{{ is_metal | ternary(metal_query, non_metal_query) }}"
|
||||
non_metal_query: "container_networks.{{ network_address }}.address || ansible_host"
|
||||
find_bridge: "container_networks.{{ network_address }}.bridge"
|
||||
metal_query: "ansible_facts.\"{{ hostvars[inventory_hostname] | json_query(find_bridge) | replace('-','_') }}\".ipv4.address || {{ non_metal_query }}"
|
||||
tags:
|
||||
- common-address
|
||||
- always
|
Loading…
Reference in New Issue
Block a user