diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-11 16:19:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-11 16:19:49 +0000 |
| commit | 205296e30eb72e7270b6eb1069007c6d30999f7a (patch) | |
| tree | e44fb62df08cb0bee3d82802f7047fd1d33f4f84 | |
| parent | 5834315ded693d35a7ad97d3760381056eb398a1 (diff) | |
| parent | 84285539087720e2c25efaed4569b9ff1c1190a7 (diff) | |
Merge "Removes deprecated OpenDaylight L2 only deployments"
| -rw-r--r-- | environments/neutron-opendaylight.yaml | 4 | ||||
| -rw-r--r-- | puppet/services/opendaylight-api.yaml | 5 |
2 files changed, 3 insertions, 6 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' diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml index 89842115..0ed9d206 100644 --- a/puppet/services/opendaylight-api.yaml +++ b/puppet/services/opendaylight-api.yaml @@ -17,10 +17,6 @@ parameters: type: string description: The password for the opendaylight server. hidden: true - OpenDaylightEnableL3: - description: Knob to enable/disable ODL L3 - type: string - default: 'no' OpenDaylightEnableDHCP: description: Knob to enable/disable ODL DHCP Server type: boolean @@ -56,7 +52,6 @@ outputs: opendaylight::odl_rest_port: {get_param: OpenDaylightPort} opendaylight::username: {get_param: OpenDaylightUsername} opendaylight::password: {get_param: OpenDaylightPassword} - opendaylight::enable_l3: {get_param: OpenDaylightEnableL3} opendaylight::extra_features: {get_param: OpenDaylightFeatures} opendaylight::enable_dhcp: {get_param: OpenDaylightEnableDHCP} opendaylight::odl_bind_ip: {get_param: [ServiceNetMap, OpendaylightApiNetwork]} |