diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-15 13:15:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-15 13:15:29 +0000 |
| commit | a309451920fa6d8f2120584b4778d6a7335fbca8 (patch) | |
| tree | d56220d742e08fac9a082d50a1df1d1ab1844c8d /environments | |
| parent | 8424e2140d25fa7f47b9e8f2be03145f7a26c4a9 (diff) | |
| parent | eaafa9247ac089a5f801b272f4705dac89d021fe (diff) | |
Merge "OVN plugin configuration fixes"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/neutron-ml2-ovn.yaml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/environments/neutron-ml2-ovn.yaml b/environments/neutron-ml2-ovn.yaml index 3da560c8..7483bdbb 100644 --- a/environments/neutron-ml2-ovn.yaml +++ b/environments/neutron-ml2-ovn.yaml @@ -3,6 +3,7 @@ resource_registry: OS::TripleO::Services::NeutronL3Agent: OS::Heat::None OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None + OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-ovn.yaml # Disabling Neutron services that overlap with OVN @@ -12,11 +13,12 @@ resource_registry: parameter_defaults: NeutronMechanismDrivers: ovn - OVNSouthboundServerPort: 6642 - OVNNorthboundServerPort: 6641 - OVNDbConnectionTimeout: 60 OVNVifType: ovs OVNNeutronSyncMode: log OVNQosDriver: ovn-qos OVNTunnelEncapType: geneve NeutronEnableDHCPAgent: false + NeutronTypeDrivers: 'geneve,vxlan,vlan,flat' + NeutronNetworkType: 'geneve' + NeutronServicePlugins: 'qos,ovn-router' + NeutronVniRanges: ['1:65536', ] |