aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-02-16 14:14:02 -0500
committerFeng Pan <fpan@redhat.com>2017-02-27 17:08:20 +0000
commit4cb1923360af513deb23d1e1bb3a614a75b2d8eb (patch)
tree74d5a46b0a582aceb126ddd4ca31aa6c6701b0ac
parent796156c83434d2e328ae09d80525bd30104472b2 (diff)
Add OpenDaylightConnectionProtocol parameter to opendaylight-api service
OpenDaylightConnectionProtocol is currently only set in opendaylight-ovs service, it needs to be set in opendaylight-api when Opendaylight is deployed with another vswitch like VPP. Closes-Bug: #1665442 Change-Id: Ib20cacd5b15586f96c880ed5a371e7e3c85a7a8c Signed-off-by: Feng Pan <fpan@redhat.com> (cherry picked from commit 1157bdbbeb1e48c1e6697341fcc64887e791d505)
-rw-r--r--puppet/services/opendaylight-api.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml
index 0ed9d206..1e7aa479 100644
--- a/puppet/services/opendaylight-api.yaml
+++ b/puppet/services/opendaylight-api.yaml
@@ -17,6 +17,10 @@ parameters:
type: string
description: The password for the opendaylight server.
hidden: true
+ OpenDaylightConnectionProtocol:
+ description: L7 protocol used for REST access
+ type: string
+ default: 'http'
OpenDaylightEnableDHCP:
description: Knob to enable/disable ODL DHCP Server
type: boolean
@@ -55,6 +59,7 @@ outputs:
opendaylight::extra_features: {get_param: OpenDaylightFeatures}
opendaylight::enable_dhcp: {get_param: OpenDaylightEnableDHCP}
opendaylight::odl_bind_ip: {get_param: [ServiceNetMap, OpendaylightApiNetwork]}
+ opendaylight::nb_connection_protocol: {get_param: OpenDayLightConnectionProtocol}
tripleo.opendaylight_api.firewall_rules:
'137 opendaylight api':
dport: