diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-23 12:45:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-23 12:45:49 +0000 |
| commit | 4c25c57c497430c5b4fd740669c8e51bbe81092a (patch) | |
| tree | 57bad4d545802f9f507fa3293bfab9a363b5ce38 /environments | |
| parent | db45116afdd0c7673c5839122dadf570303d1e4b (diff) | |
| parent | d169989598bd0db13b5944821d7ee3599267211d (diff) | |
Merge "Split OVN northd and ml2 plugin"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/neutron-ml2-ovn.yaml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/environments/neutron-ml2-ovn.yaml b/environments/neutron-ml2-ovn.yaml index bafb2a73..3da560c8 100644 --- a/environments/neutron-ml2-ovn.yaml +++ b/environments/neutron-ml2-ovn.yaml @@ -8,10 +8,10 @@ resource_registry: # Disabling Neutron services that overlap with OVN OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None + OS::TripleO::Services::OVNDBs: ../puppet/services/ovn-dbs.yaml parameter_defaults: NeutronMechanismDrivers: ovn - OVNDbHost: '0.0.0.0' OVNSouthboundServerPort: 6642 OVNNorthboundServerPort: 6641 OVNDbConnectionTimeout: 60 @@ -19,3 +19,4 @@ parameter_defaults: OVNNeutronSyncMode: log OVNQosDriver: ovn-qos OVNTunnelEncapType: geneve + NeutronEnableDHCPAgent: false |