summaryrefslogtreecommitdiffstats
path: root/ansible-adapter/ansible-adapter-bundle
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dt5972@att.com>2018-05-10 17:23:13 -0400
committerTimoney, Dan (dt5972) <dt5972@att.com>2018-05-10 17:27:01 -0400
commit13300c7f3b2cd087d74981006e5a98f8099c3cb3 (patch)
treee18abbc7b9f8e7fc5eb103c67adaeded623eb13c /ansible-adapter/ansible-adapter-bundle
parenteaa8fae3196afaad6df3ed3280845d315f2f213e (diff)
Set default http client type
If ansible-adapter.properties cannot be found, default the http client type. Change-Id: Iddebd8f1b6ff1a70d6dfbf78105d305bf1870e03 Issue-ID: CCSDK-273 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Diffstat (limited to 'ansible-adapter/ansible-adapter-bundle')
-rwxr-xr-xansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/AnsibleAdapterPropertiesProviderImpl.java5
-rw-r--r--ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adapter.properties (renamed from ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adaptor.properties)14
2 files changed, 12 insertions, 7 deletions
diff --git a/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/AnsibleAdapterPropertiesProviderImpl.java b/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/AnsibleAdapterPropertiesProviderImpl.java
index bffb494f3..482aaf8e5 100755
--- a/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/AnsibleAdapterPropertiesProviderImpl.java
+++ b/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/AnsibleAdapterPropertiesProviderImpl.java
@@ -115,6 +115,11 @@ public class AnsibleAdapterPropertiesProviderImpl implements AnsibleAdapterPrope
if (properties == null) {
reportFailure("Missing configuration properties resource(3)", new ConfigurationException(
"Missing configuration properties resource(3): " + ANSIBLEADAPTER_PROP_FILE_NAME));
+
+ LOG.info("Defaulting org.onap.appc.adapter.ansible.clientType to TRUST_ALL");
+
+ properties = new Properties();
+ properties.setProperty("org.onap.appc.adapter.ansible.clientType", "TRUST_ALL");
}
}
diff --git a/ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adaptor.properties b/ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adapter.properties
index d49c0396c..761758bbb 100644
--- a/ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adaptor.properties
+++ b/ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adapter.properties
@@ -9,15 +9,15 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
+#
# ECOMP is a trademark and service mark of AT&T Intellectual Property.
# ============LICENSE_END=========================================================
###
@@ -27,15 +27,15 @@
#
# -------------------------------------------------------------------------------------------------
#
-# Define the name and path of any user-provided configuration (bootstrap) file that can be loaded
-# to supply configuration options
+# Define the name and path of any user-provided configuration (bootstrap) file that can be loaded
+# to supply configuration options
org.onap.appc.bootstrap.file=appc.properties
org.onap.appc.bootstrap.path=${user.home},/opt/opendaylight/current/properties
appc.application.name=APPC
#
-# Define the message resource bundle name to be loaded
+# Define the message resource bundle name to be loaded
org.onap.appc.resources=org.onap/appc/i18n/MessageResources
#
# The name of the adapter.
@@ -45,4 +45,4 @@ org.onap.appc.provider.adaptor.name=org.onap.appc.appc_ansible_adapter
# Default truststore path and password
org.onap.appc.adapter.ansible.trustStore=/opt/opendaylight/tls-client/mykeystore.js
org.onap.appc.adapter.ansible.trustStore.trustPasswd=changeit
-org.onap.appc.adapter.ansible.clientType=DEFAULT
+org.onap.appc.adapter.ansible.clientType=TRUST_ALL