aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/opendaylight-ovs.yaml
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-10-14 17:36:26 -0400
committerTim Rozet <trozet@redhat.com>2016-10-17 11:32:06 -0400
commit59f19b5e37cfd970a10ece2775f2a6a4b0e508f8 (patch)
treec6803ad3fad9a6706d659fcd325e3177e01e98be /puppet/services/opendaylight-ovs.yaml
parent86f958491e514cc5bfd903742d00a5a81fa4513f (diff)
Removes EnableODL heat parameter and fixes missing local_ip param
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>
Diffstat (limited to 'puppet/services/opendaylight-ovs.yaml')
-rw-r--r--puppet/services/opendaylight-ovs.yaml1
1 files changed, 1 insertions, 0 deletions
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