diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-01-06 10:18:57 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-01-10 16:15:29 -0500 |
| commit | 84285539087720e2c25efaed4569b9ff1c1190a7 (patch) | |
| tree | 6b5ceca4b3647268988d905679bc843bd5f1937b /environments | |
| parent | 40561a3ad33c56e594908374f1d130a641294c5f (diff) | |
Removes deprecated OpenDaylight L2 only deployments
Deploying ODL without L3 DVR is no longer supported. This patch moves
the opendaylight-l3 env settings to be the new default for opendaylight
env file, while also removing any option to disable L3.
Closes-Bug: 1654586
Change-Id: Ia2488cb0b752fb4b33f03caa7a1d2469d20395f0
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/neutron-opendaylight.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/environments/neutron-opendaylight.yaml b/environments/neutron-opendaylight.yaml index dd4add2c..e08b2b27 100644 --- a/environments/neutron-opendaylight.yaml +++ b/environments/neutron-opendaylight.yaml @@ -1,11 +1,13 @@ -# A Heat environment that can be used to deploy OpenDaylight +# A Heat environment that can be used to deploy OpenDaylight with L3 DVR resource_registry: OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None OS::TripleO::Services::OpenDaylightApi: ../puppet/services/opendaylight-api.yaml OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml + OS::TripleO::Services::NeutronL3Agent: OS::Heat::None parameter_defaults: NeutronEnableForceMetadata: true NeutronMechanismDrivers: 'opendaylight_v2' + NeutronServicePlugins: 'odl-router_v2' |