openstack/tripleo-heat-templates
Code Issues Proposed changes

Removes EnableODL heat parameter and fixes missing local_ip param

Browse Source 
EnableOpenDaylightOnController was not very composable.  Removing this
parameter to make the service truly composable.  Also fixes missing
local_ip setting for OVS, required for VXLAN or GRE tenant networks.

Closes-Bug: 1633625

Depends-On: Ia55c05e12d5d434111a13e1ed795da530e3ff4a5

Change-Id: I0e07e1631793311334d1436ee8fdf9af2802ba70
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 59f19b5e37)
This commit is contained in:
Tim Rozet 2016-10-14 17:36:26 -04:00
parent 81c99ff1cd
commit f79b8bd2a6
4 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
environments/neutron-opendaylight-l3.yaml
View File

@ -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"

1
environments/neutron-opendaylight.yaml
View File

@ -7,6 +7,5 @@ resource_registry:
OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml
parameter_defaults:
EnableOpenDaylightOnController: true
NeutronEnableForceMetadata: true
NeutronMechanismDrivers: 'opendaylight'

5
puppet/services/opendaylight-api.yaml
View File

@ -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}

1
puppet/services/opendaylight-ovs.yaml
View File

@ -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