openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Add OVN chassis macs to hieradata" into stable/ussuri

This commit is contained in:
Zuul 2020-12-22 22:11:32 +00:00 committed by Gerrit Code Review
parent bd565e1735 87a9ad6a53
commit c6d6dfb995
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/converge.yml
View File

@ -45,3 +45,4 @@
- service_configs
- service_names
- vip_data
- ovn_chassis_mac_map

3
tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml
View File

@ -257,7 +257,8 @@ provisioner:
validate_ntp: true
Standalone:
hosts:
ubi8: {}
ubi8:
datacentre: bb:bb:bb:bb:bb:bb
log: true
env:
ANSIBLE_STDOUT_CALLBACK: yaml

3
tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/tests/test_hieradata_vars.py
View File

@ -34,7 +34,8 @@ def test_json_render(host):
"net_ip_map",
"service_configs",
"service_names",
"vip_data"
"vip_data",
"ovn_chassis_mac_map"
]
for f in rendered_files:

1
tripleo_ansible/roles/tripleo_hieradata/templates/ovn_chassis_mac_map.j2 Normal file
View File

@ -0,0 +1 @@
{{ hostvars[inventory_hostname]['ovn_chassis_mac_map'] | default({}) | to_nice_json }}