Merge "Fix OpenDaylightConnectionProtocol deprecated"

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'
   OpenDaylightFeatures:
     description: List of features to install with ODL
     type: comma_delimited_list
@@ -187,4 +191,4 @@ outputs:
             - service: odl
               network: {get_param: [ServiceNetMap, OpendaylightApiNetwork]}
               type: node
-          - null
+          - null

puppet/services/opendaylight-ovs.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'
   OpenDaylightCheckURL:
     description: URL postfix to verify ODL has finished starting up
     type: string