summaryrefslogtreecommitdiffstats
path: root/installation
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dt5972@att.com>2018-05-04 17:51:33 -0400
committerTimoney, Dan (dt5972) <dt5972@att.com>2018-05-04 17:51:33 -0400
commitbe3df835e60c544b5ccfa3769532ba1c3ef3343e (patch)
tree042300e19275c6d9d36152e0fb613ed052cee8d0 /installation
parent2d0ac6a16d8ad0a2e8aa4c98e97083f28e8ce53f (diff)
Fix truststore installation
Need to copy truststore to /opt/onap/sdnc/data/stores and update aaiclient.properties to use truststoreONAPall.jks as truststore Change-Id: I6c7ce1889b8c8712b8f615ce4957ec579136a895 Issue-ID: SDNC-303 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com> Former-commit-id: 702f10f093a1a11d2fcc18a7265b6fe7a1a9ce20
Diffstat (limited to 'installation')
-rwxr-xr-xinstallation/sdnc/src/main/docker/Dockerfile5
-rwxr-xr-xinstallation/src/main/properties/aaiclient.properties4
2 files changed, 7 insertions, 2 deletions
diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index f91ac84c..3cd107dc 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -6,12 +6,17 @@ MAINTAINER SDN-C Team (sdnc@lists.onap.org)
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
ENV ODL_HOME /opt/opendaylight/current
ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
+ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores
ENV SSL_CERTS_DIR /etc/ssl/certs
ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java
+
# imstall ssl and java certificates
COPY AAF_RootCA.cer $SSL_CERTS_DIR
COPY truststoreONAPall.jks $JAVA_SECURITY_DIR
+COPY AAF_RootCA.cer $SDNC_STORE_DIR
+COPY truststoreONAPall.jks $SDNC_STORE_DIR
+
RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts -deststorepass changeit
# Overlay ODL credential database with pre-staged credentials
diff --git a/installation/src/main/properties/aaiclient.properties b/installation/src/main/properties/aaiclient.properties
index 0ca976bd..386c1dd0 100755
--- a/installation/src/main/properties/aaiclient.properties
+++ b/installation/src/main/properties/aaiclient.properties
@@ -26,8 +26,8 @@
#
# Certificate keystore and truststore
#
-org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks
-org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=adminadmin
+org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/onap/sdnc/data/stores/truststoreONAPall.jks
+org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=changeit
org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true
org.onap.ccsdk.sli.adaptors.aai.client.name=SDNC