diff options
| author |   Jim Hahn <jrh3@att.com> | 2020-04-02 13:32:01 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2020-04-02 13:34:49 -0400 |
| commit | 1ebe7ecef97bdac055c8ed67c5b379a4f6c89c4c (patch) | |
| tree | 78c2ae8fd01f5b62ada851a3e3909e208ac62a3c /plans/policy/pap | |
| parent | 72ae9c392dd2c8493b3fbe50c491b4e0870caecf (diff) | |
Move policy preload to robot script
Moved the policy preload for the PAP CSIT from setup.sh to
the robot script; policy type preload isn't needed, so it
was removed altogether.
Also cleaned up some unneeded entries related to networking
and ports in the docker yml files.
Issue-ID: POLICY-2464
Change-Id: I1794dd905f2dcbdbe5f8da8c106b43b98d9a97ea
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'plans/policy/pap')
| -rw-r--r-- | plans/policy/pap/setup.sh | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/plans/policy/pap/setup.sh b/plans/policy/pap/setup.sh index 8a613bca..a5350b2d 100644 --- a/plans/policy/pap/setup.sh +++ b/plans/policy/pap/setup.sh @@ -1,7 +1,7 @@ #!/bin/bash # ============LICENSE_START======================================================= # Copyright (C) 2019 Nordix Foundation. -# Modifications Copyright (C) 2019 AT&T Intellectual Property. +# Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -57,19 +57,6 @@ echo PAP IP IS ${POLICY_PAP_IP} echo API IP IS ${POLICY_API_IP} echo MARIADB IP IS ${MARIADB_IP} -#Add policy type and policy to the database via the Policy Api -AUTH="healthcheck:zb!XztG34" -CONTYPE="Content-Type: application/json" -URL=https://${POLICY_API_IP}:6969/policy/api/v1/policytypes -CONFIGDIR=${WORKSPACE}/scripts/policy/config/pap -POLTYPE=onap.policies.monitoring.cdap.tca.hi.lo.app - -SRCFILE=${CONFIGDIR}/${POLTYPE}.json -curl -sS -k --user "${AUTH}" -H "${CONTYPE}" -d @${SRCFILE} $URL - -URL2=${URL}/${POLTYPE}/versions/1.0.0/policies -SRCFILE=${CONFIGDIR}/vCPE.policy.monitoring.input.tosca.json -curl -sS -k --user "${AUTH}" -H "${CONTYPE}" -d @${SRCFILE} $URL2 - - -ROBOT_VARIABLES="-v POLICY_PAP_IP:${POLICY_PAP_IP}" +ROBOT_VARIABLES="" +ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_PAP_IP:${POLICY_PAP_IP}" +ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_API_IP:${POLICY_API_IP}" |