From 7fa5b28878fee0bb7e96a61fd45c9672144fd1c2 Mon Sep 17 00:00:00 2001 From: Moshe Levi Date: Thu, 1 Feb 2018 13:45:45 +0200 Subject: [PATCH] Fix OpenDaylightConnectionProtocol deprecated commit af4ce05dc5270b84864a382ddb2a1161d9082eab deprecated OpenDaylightConnectionProtocol and also removed it. This patch put back the OpenDaylightConnectionProtocol Change-Id: I301f357d3244761d045ff5c250a6d52eaff85c4b --- puppet/services/opendaylight-api.yaml | 6 +++++- puppet/services/opendaylight-ovs.yaml | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml index e362adbd32..2ef3cae596 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' 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 \ No newline at end of file + - null diff --git a/puppet/services/opendaylight-ovs.yaml b/puppet/services/opendaylight-ovs.yaml index 2b15757c3a..204c5ed935 100644 --- a/puppet/services/opendaylight-ovs.yaml +++ b/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