Merge "Set Ironic default interface when using networking-ansible"
This commit is contained in:
commit
f6498b4455
|
@ -3,6 +3,7 @@ resource_registry:
|
||||||
OS::TripleO::Services::NeutronCorePlugin: ../puppet/services/neutron-plugin-ml2-ansible.yaml
|
OS::TripleO::Services::NeutronCorePlugin: ../puppet/services/neutron-plugin-ml2-ansible.yaml
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
|
IronicDefaultNetworkInterface: neutron
|
||||||
NeutronMechanismDrivers: openvswitch,ansible
|
NeutronMechanismDrivers: openvswitch,ansible
|
||||||
NeutronTypeDrivers: local,vxlan,vlan,flat
|
NeutronTypeDrivers: local,vxlan,vlan,flat
|
||||||
NeutronNetworkType: vlan
|
NeutronNetworkType: vlan
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
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
|
||||||
NeutronMechanismDrivers: openvswitch,ansible
|
NeutronMechanismDrivers: openvswitch,ansible
|
||||||
NeutronTypeDrivers: local,vxlan,vlan,flat
|
NeutronTypeDrivers: local,vxlan,vlan,flat
|
||||||
NeutronNetworkType: vlan
|
NeutronNetworkType: vlan
|
||||||
|
|
Loading…
Reference in New Issue