optf-osdf pod failing to start in k8s env

Change-Id: I4c9f4f5df5462419e39b063666ff5f5187ad71ef
Signed-off-by: vrvarma <vikas.varma@att.com>
Issue-ID: OPTFRA-729

diff --git a/assembly.xml b/assembly.xml
index c6e724a..b966691 100644 (file)
--- a/assembly.xml
+++ b/assembly.xml
@@ -28,6 +28,7 @@
                 <include>*.txt</include>
                 <include>*.ini</include>
                 <include>*.md</include>
+                <include>ssl_certs/**</include>
             </includes>
             <excludes>
                 <exclude>**/__pycache__/**</exclude>

diff --git a/docker/osdf/Dockerfile b/docker/osdf/Dockerfile
index 1533d5f..66a5aa7 100644 (file)
--- a/docker/osdf/Dockerfile
+++ b/docker/osdf/Dockerfile
@@ -65,6 +65,11 @@ RUN groupadd onap \
 COPY onap-osdf-tm/optf-osdf-${MVN_ARTIFACT_VERSION}.zip /tmp/optf-osdf.zip
 COPY onap-osdf-tm/apps /opt/osdf/apps
 RUN unzip -q -o -B /tmp/optf-osdf.zip -d /opt/ && rm -f /tmp/optf-osdf.zip
+RUN mkdir -p /usr/local/share/ca-certificates \
+    && cp /opt/osdf/ssl_certs/aaf_root_ca.cer /usr/local/share/ca-certificates/aafcacert.crt \
+    && chmod 444 /usr/local/share/ca-certificates/aafcacert.crt \
+    && update-ca-certificates
+
 RUN mkdir -p /var/log/onap/optf/osdf/ \
     && chown -R onap:onap /var/log/onap \
     && chown -R onap:onap /opt/osdf

diff --git a/osdfapp.sh b/osdfapp.sh
index 3dc4679..7e3284f 100755 (executable)
--- a/osdfapp.sh
+++ b/osdfapp.sh
@@ -58,18 +58,14 @@ set -e
 LOGS=logs
 mkdir -p $LOGS
 
-if [ -e /opt/app/ssl_cert/aaf_root_ca.cer ]; then
-    #assuming that this would be an ubuntu vm.
-    cp /opt/app/ssl_cert/aaf_root_ca.cer /usr/local/share/ca-certificates/aafcacert.crt
-    chmod 444 /usr/local/share/ca-certificates/aafcacert.crt
-    update-ca-certificates
-fi
+#if [ -e /opt/app/ssl_cert/aaf_root_ca.cer ]; then
+#    #assuming that this would be an ubuntu vm.
+#    cp /opt/app/ssl_cert/aaf_root_ca.cer /usr/local/share/ca-certificates/aafcacert.crt
+#    chmod 444 /usr/local/share/ca-certificates/aafcacert.crt
+#    update-ca-certificates
+#fi
 
-if [ -e /etc/ssl/certs/aafcacert.pem ]; then
-    export REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
-else
-    export REQUESTS_CA_BUNDLE=/opt/app/ssl_cert/aaf_root_ca.cer
-fi
+export REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
 
 if [ ! -z "$EXEC_FILE" ]
 then

diff --git a/pom.xml b/pom.xml
index 9d78e2d..cb9baad 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ http://maven.apache.org/POM/4.0.0 ">
        <groupId>org.onap.optf.osdf</groupId>
        <artifactId>optf-osdf</artifactId>
        <name>optf-osdf</name>
-       <version>2.0.1-SNAPSHOT</version>
+       <version>2.0.2-SNAPSHOT</version>
        <description>Optimization Service Design Framework</description>
 
        <properties>

diff --git a/ssl_certs/aaf_root_ca.cer b/ssl_certs/aaf_root_ca.cer
index e9a50d7..897c8ae 100644 (file)
--- a/ssl_certs/aaf_root_ca.cer
+++ b/ssl_certs/aaf_root_ca.cer
@@ -28,4 +28,4 @@ Z0LlaKABqfjK49o/tsAp+c5LoNlYllKhnetO3QAdraHwdmC36BhoghzR1jpX751A
 cZn2VH3Q4XKyp01cJNCJIrua+A+bx6zh3RyW6zIIkbRCbET+UD+4mr8WIcSE3mtR
 ZVlnhUDO4z9//WKMVzwS9Rh8/kuszrGFI1KQozXCHLrce3YP6RYZfOed79LXaRwX
 dYY=
------END CERTIFICATE-----
+-----END CERTIFICATE-----
\ No newline at end of file

diff --git a/version.properties b/version.properties
index 8c7f2a6..487c94e 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -19,7 +19,7 @@
 
 major=2
 minor=0
-patch=1
+patch=2
 
 base_version=${major}.${minor}.${patch}