summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-11 16:19:49 +0000
committerGerrit Code Review <review@openstack.org>2017-01-11 16:19:49 +0000
commit205296e30eb72e7270b6eb1069007c6d30999f7a (patch)
treee44fb62df08cb0bee3d82802f7047fd1d33f4f84 /environments
parent5834315ded693d35a7ad97d3760381056eb398a1 (diff)
parent84285539087720e2c25efaed4569b9ff1c1190a7 (diff)
Merge "Removes deprecated OpenDaylight L2 only deployments"
Diffstat (limited to 'environments')
-rw-r--r--environments/neutron-opendaylight.yaml4
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'