From 84285539087720e2c25efaed4569b9ff1c1190a7 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 6 Jan 2017 10:18:57 -0500 Subject: Removes deprecated OpenDaylight L2 only deployments Deploying ODL without L3 DVR is no longer supported. This patch moves the opendaylight-l3 env settings to be the new default for opendaylight env file, while also removing any option to disable L3. Closes-Bug: 1654586 Change-Id: Ia2488cb0b752fb4b33f03caa7a1d2469d20395f0 Signed-off-by: Tim Rozet --- puppet/services/opendaylight-api.yaml | 5 ----- 1 file changed, 5 deletions(-) (limited to 'puppet/services/opendaylight-api.yaml') 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]} -- cgit 1.2.3-korg