Browse Source

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

changes/20/786320/1
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
3e78f21aa4
4 changed files with 6 additions and 2 deletions
  1. +2
    -1
      tripleo_ansible/roles/tripleo-hieradata/molecule/ansible_hieradata/molecule.yml
  2. +1
    -0
      tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/playbook.yml
  3. +2
    -1
      tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/tests/test_hieradata_vars.py
  4. +1
    -0
      tripleo_ansible/roles/tripleo-hieradata/templates/ovn_chassis_mac_map.j2

+ 2
- 1
tripleo_ansible/roles/tripleo-hieradata/molecule/ansible_hieradata/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


+ 1
- 0
tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/playbook.yml View File

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

+ 2
- 1
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
- 0
tripleo_ansible/roles/tripleo-hieradata/templates/ovn_chassis_mac_map.j2 View File

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

Loading…
Cancel
Save