diff options
| -rw-r--r-- | auth/auth-cass/cass_init/cmd.sh | 4 | ||||
| -rw-r--r-- | auth/docker/dclean.sh | 6 | ||||
| -rw-r--r-- | auth/docker/drun.sh | 3 |
3 files changed, 4 insertions, 9 deletions
diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh index afb66774..b3d5292c 100644 --- a/auth/auth-cass/cass_init/cmd.sh +++ b/auth/auth-cass/cass_init/cmd.sh @@ -32,7 +32,7 @@ function wait_start { function wait_cql { status wait for keyspace to be initialized for CNT in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do - if [ "`/usr/bin/cqlsh -e 'describe keyspaces' | grep authz`" == "" ]; then + if [ -n "$(/usr/bin/cqlsh -e 'describe keyspaces' | grep authz)" ]; then break else echo "Waiting for Keyspaces to be loaded... Sleep 10" @@ -130,6 +130,8 @@ case "$1" in # Make sure Keyspace is loaded wait_cql + + # Wait for Data load? status ready ;; onap) diff --git a/auth/docker/dclean.sh b/auth/docker/dclean.sh index d83a1329..f8550674 100644 --- a/auth/docker/dclean.sh +++ b/auth/docker/dclean.sh @@ -8,14 +8,10 @@ else AAF_COMPONENTS="$@" fi -docker image rm $ORG/$PROJECT/aaf_agent:${VERSION} -docker image rm $ORG/$PROJECT/aaf_config:${VERSION} -docker image rm $ORG/$PROJECT/aaf_core:${VERSION} - echo "Y" | docker container prune for AAF_COMPONENT in ${AAF_COMPONENTS}; do docker image rm $ORG/$PROJECT/aaf_$AAF_COMPONENT:${VERSION} - if [ "$PREFIX" = "" ]; then + if [ ! "$PREFIX" = "" ]; then docker image rm $DOCKER_REPOSITORY/$ORG/$PROJECT/aaf_$AAF_COMPONENT:${VERSION} docker image rm $DOCKER_REPOSITORY/$ORG/$PROJECT/aaf_$AAF_COMPONENT:latest fi diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh index a8f03936..96405f24 100644 --- a/auth/docker/drun.sh +++ b/auth/docker/drun.sh @@ -67,9 +67,6 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do for A in aaf.osaaf.org $AH_ROOT; do ADD_HOST="$ADD_HOST --add-host=$A:$HOST_IP" - for SA in service locate oauth gui fs cm hello; do - ADD_HOST="$ADD_HOST --add-host=$SA.$A:$HOST_IP" - done done docker run \ |