Merge "Removes EnableODL heat parameter and fixes missing local_ip param"

4 files changed, 1 insertions, 7 deletions

diff --git a/environments/neutron-opendaylight-l3.yaml b/environments/neutron-opendaylight-l3.yaml
index 5c47147e..00be3048 100644
--- a/environments/neutron-opendaylight-l3.yaml
+++ b/environments/neutron-opendaylight-l3.yaml
@@ -8,7 +8,6 @@ resource_registry:
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
 
 parameter_defaults:
-  EnableOpenDaylightOnController: true
   NeutronEnableForceMetadata: true
   NeutronMechanismDrivers: 'opendaylight'
   NeutronServicePlugins: "networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin"
diff --git a/environments/neutron-opendaylight.yaml b/environments/neutron-opendaylight.yaml
index 8110eab3..35c90aab 100644
--- a/environments/neutron-opendaylight.yaml
+++ b/environments/neutron-opendaylight.yaml
@@ -7,6 +7,5 @@ resource_registry:
   OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml
 
 parameter_defaults:
-  EnableOpenDaylightOnController: true
   NeutronEnableForceMetadata: true
   NeutronMechanismDrivers: 'opendaylight'
diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml
index 30351dfb..318c898e 100644
--- a/puppet/services/opendaylight-api.yaml
+++ b/puppet/services/opendaylight-api.yaml
@@ -8,10 +8,6 @@ parameters:
     default: 8081
     description: Set opendaylight service port
     type: number
-  EnableOpenDaylightOnController:
-    default: false
-    description: Whether to install OpenDaylight on control nodes.
-    type: boolean
   OpenDaylightUsername:
     default: 'admin'
     description: The username for the opendaylight server.
@@ -58,7 +54,6 @@ outputs:
       service_name: opendaylight_api
       config_settings:
         opendaylight::odl_rest_port: {get_param: OpenDaylightPort}
-        odl_on_controller: {get_param: EnableOpenDaylightOnController}
         opendaylight::username: {get_param: OpenDaylightUsername}
         opendaylight::password: {get_param: OpenDaylightPassword}
         opendaylight::enable_l3: {get_param: OpenDaylightEnableL3}
diff --git a/puppet/services/opendaylight-ovs.yaml b/puppet/services/opendaylight-ovs.yaml
index ea7410ca..268ca244 100644
--- a/puppet/services/opendaylight-ovs.yaml
+++ b/puppet/services/opendaylight-ovs.yaml
@@ -48,6 +48,7 @@ outputs:
         opendaylight::odl_rest_port: {get_param: OpenDaylightPort}
         opendaylight_check_url: {get_param: OpenDaylightCheckURL}
         opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol}
+        neutron::agents::ml2::ovs::local_ip: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
         neutron::plugins::ovs::opendaylight::provider_mappings:
           str_replace:
             template: MAPPINGS