From dd496f06c0b1ea5da184c78d02ac7a01114a2fad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Wed, 23 Sep 2020 01:13:07 +0200 Subject: [PATCH] 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 (cherry picked from commit 6362a0205f17d30d7a5048b38770d5ef920a3259) --- network/networks.j2.yaml | 3 --- overcloud.j2.yaml | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml index c689c7c817..a868b11bc0 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 a0606fb464..17ccc9af8b 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -897,6 +897,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