aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-05 18:04:31 +0000
committerGerrit Code Review <review@openstack.org>2017-04-05 18:04:31 +0000
commitbba584afc34cea119509c06c95d35bfd34eed7fc (patch)
tree602da0247a9a97d8f541d0f782dfd0ee50c65933 /puppet/services
parentb8855022563dda29aa78590a67386db35c5c6687 (diff)
parent4cb1923360af513deb23d1e1bb3a614a75b2d8eb (diff)
Merge "Add OpenDaylightConnectionProtocol parameter to opendaylight-api service" into stable/ocata
Diffstat (limited to 'puppet/services')
-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 51a520cc..ceb56a81 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: