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 6362a0205f
)
This commit is contained in:
parent
dca5b16cb4
commit
dd496f06c0
|
@ -14,9 +14,6 @@ resources:
|
||||||
type: OS::TripleO::Network::{{network.name}}
|
type: OS::TripleO::Network::{{network.name}}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
|
||||||
OVNMacAddressNetwork:
|
|
||||||
type: OS::TripleO::OVNMacAddressNetwork
|
|
||||||
|
|
||||||
NetworkExtraConfig:
|
NetworkExtraConfig:
|
||||||
type: OS::TripleO::Network::ExtraConfig
|
type: OS::TripleO::Network::ExtraConfig
|
||||||
|
|
||||||
|
|
|
@ -897,6 +897,9 @@ resources:
|
||||||
properties:
|
properties:
|
||||||
CtlplaneNetworkCidrs: {get_attr: [ControlVirtualIP, network, tags]}
|
CtlplaneNetworkCidrs: {get_attr: [ControlVirtualIP, network, tags]}
|
||||||
|
|
||||||
|
OVNMacAddressNetwork:
|
||||||
|
type: OS::TripleO::OVNMacAddressNetwork
|
||||||
|
|
||||||
{%- for role in roles %}
|
{%- for role in roles %}
|
||||||
{{role.name}}GroupVars:
|
{{role.name}}GroupVars:
|
||||||
type: OS::Heat::Value
|
type: OS::Heat::Value
|
||||||
|
|
Loading…
Reference in New Issue