Merge "Refactor OVNMacAddressNetwork" into stable/ussuri
This commit is contained in:
commit
ae711f8821
|
@ -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