Merge "Provide support for properties encryption"

diff --git a/INFO.yaml b/INFO.yaml
new file mode 100644 (file)
index 0000000..6adf286
--- /dev/null
+++ b/INFO.yaml
@@ -0,0 +1,42 @@
+---
+project: 'ccsdk-sli-adaptors'
+project_creation_date: '2017-06-27'
+lifecycle_state: 'Incubation'
+project_lead: &onap_releng_ptl
+    name: 'Dan Timoney'
+    email: 'dtimoney@att.com'
+    id: 'djtimoney'
+    company: 'ATT'
+    timezone: 'America/New York'
+primary_contact: *onap_releng_ptl
+issue_tracking:
+    type: 'jira'
+    url: 'https://jira.onap.org/projects/CCSDK'
+    key: 'CCDSK'
+meetings:
+    - type: 'zoom'
+        agenda: 'https://wiki.onap.org/display/DW/Common+Controller+SDK+Project'
+        url: 'https://wiki.onap.org/display/DW/Common+Controller+SDK+Project#CommonControllerSDKProject-MeetingMinutes'
+        server: 'n/a'
+        channel: 'n/a'
+        repeats: 'weekly'
+        time: '13:00 UTC'
+committers:
+    - <<: *onap_releng_ptl
+    - name: 'Jack Lucas'
+        email: 'jflucas@research.att.com'
+        company: 'ATT'
+        id: 'jackl'
+        timezone: 'America/New York'
+    - name: 'Jun (Nicolas) Hu'
+        email: 'jh245g@att.com'
+        company: 'ATT'
+        id: 'jh245g'
+        timezone: 'America/New York'
+    - name: 'Ryan Goulding'
+        email: 'ryandgoulding@gmail.com'
+        company: 'Inocybe Technologies'
+        id: 'rgoulding'
+        timezone: 'America/New York'
+tsc:
+    approval: 'https://lists.onap.org/pipermail/onap-tsc'

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 bffb494..482aaf8 100755 (executable)
--- 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
similarity index 91%
rename from ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adaptor.properties
rename to ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adapter.properties
index d49c039..761758b 100644 (file)
--- 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