add installation files as environments for PDP-D

see counterpart drools-pdp review.

this will make installation files available
to PDP-D and its drools applications

Change-Id: Ib06820136b5a93eb0adfcb43216666bcc2677de4
Issue-ID: POLICY-162
Signed-off-by: Jorge Hernandez <jh1730@att.com>

diff --git a/config/drools/base.conf b/config/drools/base.conf
index a1eab46..e9068b6 100644 (file)
--- a/config/drools/base.conf
+++ b/config/drools/base.conf
@@ -89,3 +89,9 @@ AAI_PASSWORD=POLICY
 MSO_URL=http://vm1.mso.simpledemo.openecomp.org:8080/ecomp/mso/infra
 MSO_USERNAME=InfraPortalClient
 MSO_PASSWORD=password1$
+
+# VFC
+
+VFC_URL=
+VFC_USERNAME=
+VFC_PASSWORD=

diff --git a/policy-drools/Dockerfile b/policy-drools/Dockerfile
index b89d058..d4cd77b 100644 (file)
--- a/policy-drools/Dockerfile
+++ b/policy-drools/Dockerfile
@@ -8,8 +8,8 @@ WORKDIR /tmp/policy-install
 
 COPY install-drools.zip apps.zip docker-install.sh do-start.sh wait-for-port.sh ./
 
-RUN unzip install-drools.zip && \
-    unzip apps.zip && \
+RUN unzip -o install-drools.zip && \
+    unzip -o apps.zip && \
     rm install-drools.zip apps.zip && \
     chown -R policy * && \
     chmod +x *.sh

diff --git a/policy-drools/docker-install.sh b/policy-drools/docker-install.sh
index 40a1264..012934a 100644 (file)
--- a/policy-drools/docker-install.sh
+++ b/policy-drools/docker-install.sh
@@ -413,7 +413,6 @@ function install_base() {
                        BASEX_TGZ=
                fi                      
        fi
-
        
        # Undo any changes in the $HOME directory if any
        
@@ -470,6 +469,7 @@ function install_base() {
        
        configure_base
        
+       # save ${BASE_CONF} in PDP-D installation
        cp "${BASE_CONF}" "${POLICY_HOME}"/etc/profile.d
        
 #      if ! create_keystore; then
@@ -631,6 +631,9 @@ EOF
        fi
 
        update_monitor $CONTROLLER_NAME
+
+       # save install configuration as an environment file
+       ln -s -f "${POLICY_HOME}/etc/profile.d/${BASE_CONF}" "${POLICY_HOME}/config/${BASE_CONF}.environment"
 }