diff options
| author |   Michael Mokry <mm117s@att.com> | 2019-06-03 15:13:03 -0500 |
|---|---|---|
| committer |   Michael Mokry <michael.mokry@att.com> | 2019-06-18 08:07:29 -0500 |
| commit | a9bbc763a628ebf601825d080c107ede3894b726 (patch) | |
| tree | 0f348edcf40fb27f993245f816e8a333a4f6f476 /packages/policy-xacmlpdp-docker/src/main | |
| parent | 2af8ab7ce69fba12631dd4bc51acb2cd892dc7c0 (diff) | |
Create the operationshistory table from pdpx
Added create table sql statement to the policy-pdpx.sh to create the operationshistory table during
xacml-pdp installation
Added changes per Jorge's review
1) Added sql file with create table statement
2) Added bash script to execute sql file
3) modified policy-pdpx.sh to execute new bash script
4) other changes
Change-Id: Iaae63dc65db1ff9181de12928e072f04c87e50e7
Issue-ID: POLICY-1827
Signed-off-by: Michael Mokry <michael.mokry@att.com>
Diffstat (limited to 'packages/policy-xacmlpdp-docker/src/main')
| -rw-r--r-- | packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile | 5 | ||||
| -rw-r--r-- | packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile index ea3b97f8..0f64e0e2 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile +++ b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile @@ -7,11 +7,10 @@ ARG POLICY_LOGS=/var/log/onap/policy/pdpx ENV POLICY_LOGS ${POLICY_LOGS} ENV POLICY_HOME=/opt/app/policy/pdpx - +RUN apk add --no-cache mariadb-client RUN mkdir -p ${POLICY_HOME} ${POLICY_LOGS} ${POLICY_HOME}/etc/ssl ${POLICY_HOME}/bin ${POLICY_HOME}/apps && \ - chown -R policy:policy ${POLICY_HOME} ${POLICY_LOGS} + chown -R policy:policy ${POLICY_HOME} ${POLICY_LOGS} && mkdir /packages -RUN mkdir /packages COPY /maven/* /packages RUN tar xvfz /packages/policy-xacmlpdp.tar.gz --directory ${POLICY_HOME} && \ rm /packages/policy-xacmlpdp.tar.gz diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh index 9e32d500..f27d65d2 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh +++ b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh @@ -33,9 +33,9 @@ else fi if [ "$#" -ge 2 ]; then - PROP_FILE=$2 + PROP_FILE=$2 else - PROP_FILE=${PROP_FILE} + PROP_FILE=${PROP_FILE} fi if [ -z "$CONFIG_FILE" ] @@ -52,6 +52,9 @@ if [[ -f ${POLICY_HOME}/etc/mounted/xacml.properties ]]; then cp -f "${POLICY_HOME}"/etc/mounted/xacml.properties "${POLICY_HOME}"/apps/guard/ fi +# Create operationshistory table +${POLICY_HOME}/mysql/bin/create-guard-table.sh + echo "Policy Xacml PDP config file: $CONFIG_FILE" echo "Policy Xacml PDP topic properties file: $PROP_FILE" |