Fix image names in existing AAF CSIT

[integration/csit.git] / plans / aaf / aafapi / setup.sh

diff --git a/plans/aaf/aafapi/setup.sh b/plans/aaf/aafapi/setup.sh
index 8207367..d2b0443 100644 (file)
--- a/plans/aaf/aafapi/setup.sh
+++ b/plans/aaf/aafapi/setup.sh
@@ -51,9 +51,8 @@ echo "Current Dir: ${PWD}"
 
 # Locate to Docker dir
 cd auth/docker
-if [ ! -e d.props ]; then
-  cp d.props.init d.props
-fi
+cp d.props.csit d.props
+
 echo "Current Dir: ${PWD}"
 source d.props
 
@@ -100,7 +99,7 @@ if [ -z "$SKIP_PULL" ]; then
   docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_hello:$AAF_DOCKER_VERSION
   docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_locate:$AAF_DOCKER_VERSION
   docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_oauth:$AAF_DOCKER_VERSION
-  docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_service:$AAF_DOCKER_VERSION
+  docker pull $DOCKER_REPOSITORY/onap/aaf/aafservice:$AAF_DOCKER_VERSION
 fi
 # Cassandra Install/Start
 cd ../auth-cass/docker