From: Dan Timoney <dtimoney@att.com>
Date: Tue, 26 Mar 2019 13:35:36 +0000 (+0000)
Subject: Merge "SDNC-665: Python script for adding to ODL keystore"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=220ebdca39a85491b22acc7ed9024a348652b1b0;hp=-c;p=sdnc%2Foam.git

Merge "SDNC-665: Python script for adding to ODL keystore"
---

220ebdca39a85491b22acc7ed9024a348652b1b0
diff --combined installation/sdnc/src/main/docker/Dockerfile
index e7d592eb,1a76fe6f..a9aa42ec
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@@ -27,6 -27,7 +27,7 @@@ RUN keytool -importkeystore -srckeystor
  # copy onap
  COPY opt /opt
  RUN test -L /opt/sdnc || ln -s /opt/onap/sdnc /opt/sdnc
+ RUN mkdir /opt/opendaylight/current/certs
  
  # copy SDNC mvn artifacts to ODL repository
  COPY system /tmp/system
@@@ -36,7 -37,6 +37,7 @@@ RUN rsync -a /tmp/system $ODL_HOME && r
  RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
  RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
  RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 +RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-connector-all,odl-netconf-clustered-topology/g"  $ODL_HOME/etc/org.apache.karaf.features.cfg
  
  RUN chown -R odl /opt
  USER odl