Merge "Change NeutronMechanismDrivers in ml2-ansible environments"
This commit is contained in:
commit
55234d27f6
|
@ -4,6 +4,6 @@ resource_registry:
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
IronicDefaultNetworkInterface: neutron
|
IronicDefaultNetworkInterface: neutron
|
||||||
NeutronMechanismDrivers: openvswitch,ansible
|
NeutronMechanismDrivers: ovn,ansible
|
||||||
NeutronTypeDrivers: local,vxlan,vlan,flat
|
NeutronTypeDrivers: local,geneve,vlan,flat
|
||||||
NeutronNetworkType: vlan
|
NeutronNetworkType: vlan
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
# A Heat environment file which can be used to enable network-ansible ML2 mechanism driver
|
# A Heat environment file which can be used to enable network-ansible ML2 mechanism driver
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Ansible
|
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Ansible
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
IronicDefaultNetworkInterface: neutron
|
IronicDefaultNetworkInterface: neutron
|
||||||
NeutronMechanismDrivers: openvswitch,ansible
|
NeutronMechanismDrivers: ovn,ansible
|
||||||
NeutronTypeDrivers: local,vxlan,vlan,flat
|
NeutronTypeDrivers: local,geneve,vlan,flat
|
||||||
NeutronNetworkType: vlan
|
NeutronNetworkType: vlan
|
||||||
|
|
Loading…
Reference in New Issue