From: Feng Pan <fpan@redhat.com>
Date: Thu, 16 Feb 2017 19:14:02 +0000 (-0500)
Subject: Add OpenDaylightConnectionProtocol parameter to opendaylight-api service
X-Git-Tag: opnfv-6.0.0~1000^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1157bdbbeb1e48c1e6697341fcc64887e791d505;p=apex-tripleo-heat-templates.git

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

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: