diff options
| author |   Jorge Hernandez <jh1730@att.com> | 2017-09-06 19:42:47 -0500 |
|---|---|---|
| committer | Jorge Hernandez <jh1730@att.com> | 2017-09-06 21:47:12 -0500 |
| commit | 5ed2f95fceb784bfb8f85b4cc84e593836b6acf4 (patch) | |
| tree | 74f560ece565489fd52d3c8323e95b106d4e1652 | |
| parent | d69cc0da6b6675d3d7f6734092ae4569c6bcf8ea (diff) | |
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>
| -rw-r--r-- | config/drools/base.conf | 6 | ||||
| -rw-r--r-- | policy-drools/Dockerfile | 4 | ||||
| -rw-r--r-- | policy-drools/docker-install.sh | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/config/drools/base.conf b/config/drools/base.conf index a1eab464..e9068b69 100644 --- 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 b89d0587..d4cd77b8 100644 --- 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 40a12649..012934ad 100644 --- 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" } |