openstack/openstack-ansible
Code Issues Proposed changes

Use ansible_facts[] instead of fact variables in AIO config

Browse Source 
See https://github.com/ansible/ansible/issues/73654

Change-Id: I155cec1e687f46800880af48276ba8709bfe59b3
This commit is contained in:
Jonathan Rosser 2021-03-01 13:26:00 +00:00
parent 3f1c6c0626
commit 3abb80ec09
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/openstack_deploy/openstack_user_config.yml.aio
View File

@ -24,7 +24,7 @@ global_overrides:
internal_lb_vip_address: 172.29.236.100 internal_lb_vip_address: 172.29.236.100
# The external IP is quoted simply to ensure that the .aio file can be used as input # The external IP is quoted simply to ensure that the .aio file can be used as input
# dynamic inventory testing. # dynamic inventory testing.
external_lb_vip_address: "{{ bootstrap_host_public_address | default(ansible_default_ipv4.address) }}" external_lb_vip_address: "{{ bootstrap_host_public_address | default(ansible_facts['default_ipv4']['address']) }}"
management_bridge: "br-mgmt" management_bridge: "br-mgmt"
provider_networks: provider_networks:
- network: - network:

20
etc/openstack_deploy/openstack_user_config.yml.aio-nspawn.j2
View File

@ -17,12 +17,12 @@ used_ips:
global_overrides: global_overrides:
internal_lb_vip_address: 172.29.236.100 internal_lb_vip_address: 172.29.236.100
external_lb_vip_address: "{{ bootstrap_host_public_address | default(ansible_default_ipv4['address']) }}" external_lb_vip_address: "{{ bootstrap_host_public_address | default(ansible_facts['default_ipv4']['address']) }}"
tunnel_bridge: "mv-vxlan" tunnel_bridge: "mv-vxlan"
management_bridge: "mv-{{ ansible_default_ipv4['alias'] }}" management_bridge: "mv-{{ ansible_facts['default_ipv4']['alias'] }}"
provider_networks: provider_networks:
- network: - network:
container_bridge: "{{ ansible_default_ipv4['alias'] }}" container_bridge: "{{ ansible_facts['default_ipv4']['alias'] }}"
container_interface: "mv-container" container_interface: "mv-container"
ip_from_q: "container" ip_from_q: "container"
type: "raw" type: "raw"
@ -31,7 +31,7 @@ global_overrides:
- all_containers - all_containers
- hosts - hosts
- network: - network:
container_bridge: "{{ ansible_default_ipv4['alias'] }}" container_bridge: "{{ ansible_facts['default_ipv4']['alias'] }}"
container_interface: "mv-flat" container_interface: "mv-flat"
host_bind_override: "mv-flat" host_bind_override: "mv-flat"
ip_from_q: "flat" ip_from_q: "flat"
@ -45,7 +45,7 @@ global_overrides:
- rabbitmq - rabbitmq
- utility_all - utility_all
- network: - network:
container_bridge: "{{ ansible_default_ipv4['alias'] }}" container_bridge: "{{ ansible_facts['default_ipv4']['alias'] }}"
container_interface: "mv-storage" container_interface: "mv-storage"
ip_from_q: "storage" ip_from_q: "storage"
type: "raw" type: "raw"
@ -57,7 +57,7 @@ global_overrides:
- nova_compute - nova_compute
- swift_proxy - swift_proxy
- network: - network:
container_bridge: "{{ ansible_default_ipv4['alias'] }}" container_bridge: "{{ ansible_facts['default_ipv4']['alias'] }}"
container_interface: "mv-vxlan" container_interface: "mv-vxlan"
ip_from_q: "vxlan" ip_from_q: "vxlan"
type: "vxlan" type: "vxlan"
@ -106,22 +106,22 @@ aio_block: &aio_info_block
# to it. # to it.
container_extra_networks: container_extra_networks:
container_network: container_network:
bridge: "{{ ansible_default_ipv4['alias'] }}" bridge: "{{ ansible_facts['default_ipv4']['alias'] }}"
interface: mv-container interface: mv-container
address: 172.29.236.100 address: 172.29.236.100
netmask: 255.255.252.0 netmask: 255.255.252.0
flat_network: flat_network:
bridge: "{{ ansible_default_ipv4['alias'] }}" bridge: "{{ ansible_facts['default_ipv4']['alias'] }}"
interface: mv-flat interface: mv-flat
address: 172.29.240.100 address: 172.29.240.100
netmask: 255.255.252.0 netmask: 255.255.252.0
storage_network: storage_network:
bridge: "{{ ansible_default_ipv4['alias'] }}" bridge: "{{ ansible_facts['default_ipv4']['alias'] }}"
interface: mv-storage interface: mv-storage
address: 172.29.244.100 address: 172.29.244.100
netmask: 255.255.252.0 netmask: 255.255.252.0
vxlan_network: vxlan_network:
bridge: "{{ ansible_default_ipv4['alias'] }}" bridge: "{{ ansible_facts['default_ipv4']['alias'] }}"
interface: mv-vxlan interface: mv-vxlan
address: 172.29.248.100 address: 172.29.248.100
netmask: 255.255.252.0 netmask: 255.255.252.0

2
etc/openstack_deploy/openstack_user_config.yml.aio.j2
View File

@ -34,7 +34,7 @@ global_overrides:
internal_lb_vip_address: 172.29.236.101 internal_lb_vip_address: 172.29.236.101
# The external IP is quoted simply to ensure that the .aio file can be used as input # The external IP is quoted simply to ensure that the .aio file can be used as input
# dynamic inventory testing. # dynamic inventory testing.
external_lb_vip_address: "{{ bootstrap_host_public_address | default(ansible_default_ipv4.address) }}" external_lb_vip_address: "{{ bootstrap_host_public_address | default(ansible_facts['default_ipv4']['address']) }}"
management_bridge: "br-mgmt" management_bridge: "br-mgmt"
no_containers: {{ true if 'metal' in bootstrap_host_scenarios else false }} no_containers: {{ true if 'metal' in bootstrap_host_scenarios else false }}
provider_networks: provider_networks: