diff --git a/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/converge.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/converge.yml
index 5685c3fd0..4059b44b8 100644
--- a/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/converge.yml
+++ b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/converge.yml
@@ -45,3 +45,4 @@
           - service_configs
           - service_names
           - vip_data
+          - ovn_chassis_mac_map
diff --git a/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml
index f3e3f0a90..f4deb3ebe 100644
--- a/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml
+++ b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml
@@ -256,7 +256,8 @@ provisioner:
           validate_ntp: true
       Standalone:
         hosts:
-          ubi8: {}
+          ubi8:
+            datacentre: bb:bb:bb:bb:bb:bb
   log: true
   env:
     ANSIBLE_STDOUT_CALLBACK: yaml
diff --git a/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/tests/test_hieradata_vars.py b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/tests/test_hieradata_vars.py
index eaea07d6b..171725725 100644
--- a/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/tests/test_hieradata_vars.py
+++ b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/tests/test_hieradata_vars.py
@@ -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:
diff --git a/tripleo_ansible/roles/tripleo_hieradata/templates/ovn_chassis_mac_map.j2 b/tripleo_ansible/roles/tripleo_hieradata/templates/ovn_chassis_mac_map.j2
new file mode 100644
index 000000000..7c990b148
--- /dev/null
+++ b/tripleo_ansible/roles/tripleo_hieradata/templates/ovn_chassis_mac_map.j2
@@ -0,0 +1 @@
+{{ hostvars[inventory_hostname]['ovn_chassis_mac_map'] | default({}) | to_nice_json }}