commit 6362a0205f17d30d7a5048b38770d5ef920a3259
Author: Harald Jensås <hjensas@redhat.com>
Date:   Wed Sep 23 01:13:07 2020 +0200

    Refactor OVNMacAddressNetwork
    
    Move the OVNMacAddressNetwork resource out of the
    Networks resource. This is a special network that
    we want to create internally.
    
    Having this network nested in the Networks resource
    interfer with the work related to creating composable
    networks with non-heat tooling.
    
    Change-Id: I5551af42bc87fb8489edbfbd2abadba3dca30b0b

diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml
index c689c7c..a868b11 100644
--- a/network/networks.j2.yaml
+++ b/network/networks.j2.yaml
@@ -14,9 +14,6 @@ resources:
     type: OS::TripleO::Network::{{network.name}}
   {%- endfor %}
 
-  OVNMacAddressNetwork:
-    type: OS::TripleO::OVNMacAddressNetwork
-
   NetworkExtraConfig:
     type: OS::TripleO::Network::ExtraConfig
 
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 0a06f5e..4efda0c 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -914,6 +914,9 @@ resources:
     properties:
       CtlplaneNetworkCidrs: {get_attr: [ControlVirtualIP, network, tags]}
 
+  OVNMacAddressNetwork:
+    type: OS::TripleO::OVNMacAddressNetwork
+
 {%- for role in roles %}
   {{role.name}}GroupVars:
     type: OS::Heat::Value