diff options
| author |   ChrisC <christophe.closset@intl.att.com> | 2020-03-17 14:23:42 +0100 |
|---|---|---|
| committer | ChrisC <christophe.closset@intl.att.com> | 2020-03-24 13:37:37 +0100 |
| commit | 48bcfb9d4b03ac3e2e6915f7bdf72599c8794d43 (patch) | |
| tree | f0d2d8d6946ea76d6f54533538dff131c8a70cef /auth/auth-cass/cass_init | |
| parent | 083a7eb21620467ae1f7d5ba9341e12f75f9cc41 (diff) | |
AAF non-root
update AAF service dockerfiles to run as user AAF, reusing existing script infra
Issue-ID: AAF-1102
Signed-off-by: ChrisC <christophe.closset@intl.att.com>, JulienBe <jb3179x@att.com>
Change-Id: I2d9feef65a98d4545e407825533cd1741f891b45
Diffstat (limited to 'auth/auth-cass/cass_init')
| -rw-r--r-- | auth/auth-cass/cass_init/cmd.sh | 13 | ||||
| -rw-r--r-- | auth/auth-cass/cass_init/restore.sh | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh index 7569440f..f605a472 100644 --- a/auth/auth-cass/cass_init/cmd.sh +++ b/auth/auth-cass/cass_init/cmd.sh @@ -24,6 +24,7 @@ DIR="/opt/app/aaf/status" INSTALLED_VERSION=/var/lib/cassandra/AAF_VERSION AAF_INIT_DATA=/var/lib/cassandra/AAF_INIT_DATA +CQLSH=${CQLSH:=/opt/cassandra/bin/cqlsh} if [ ! -e /aaf_cmd ]; then ln -s /opt/app/aaf/cass_init/cmd.sh /aaf_cmd @@ -71,7 +72,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 [ -n "$(cqlsh -e 'describe keyspaces' | grep authz)" ]; then + if [ -n "$($CQLSH -e 'describe keyspaces' | grep authz)" ]; then break else echo "Waiting for Keyspaces to be loaded... Sleep 10" @@ -96,11 +97,11 @@ function wait_ready { function install_cql { wait_start cassandra responsive # Now, make sure data exists - if [ ! -e $INSTALLED_VERSION ] && [ -n "$(cqlsh -e 'describe keyspaces' | grep authz)" ]; then - cqlsh --request-timeout=60 -e 'DROP KEYSPACE authz' + if [ ! -e $INSTALLED_VERSION ] && [ -n "$($CQLSH -e 'describe keyspaces' | grep authz)" ]; then + $CQLSH --request-timeout=60 -e 'DROP KEYSPACE authz' fi - if [ -z "`cqlsh --request-timeout 60 -e 'describe keyspaces' | grep authz`" ]; then + if [ -z "$($CQLSH --request-timeout 60 -e 'describe keyspaces' | grep authz)" ]; then status install echo "Initializing Cassandra DB" echo "Docker Installed Basic Cassandra on aaf.cass. Executing the following " @@ -109,10 +110,10 @@ function install_cql { echo " cd /opt/app/aaf/cass_init" cd /opt/app/aaf/cass_init echo " cqlsh -f keyspace.cql" - cqlsh --request-timeout=100 -f keyspace.cql + $CQLSH --request-timeout=100 -f keyspace.cql status keyspace installed echo " cqlsh -f init.cql" - cqlsh --request-timeout=100 -f init.cql + $CQLSH --request-timeout=100 -f init.cql status data initialized echo "" echo "The following will give you a temporary identity with which to start working, or emergency" diff --git a/auth/auth-cass/cass_init/restore.sh b/auth/auth-cass/cass_init/restore.sh index abc6a7cc..ba2c49eb 100644 --- a/auth/auth-cass/cass_init/restore.sh +++ b/auth/auth-cass/cass_init/restore.sh @@ -4,7 +4,7 @@ echo `date` ENV=DOCKER -CQLSH="cqlsh -k authz" +CQLSH="${CQLSH:=/opt/cassandra/bin/cqlsh} -k authz" cd dats if [ "$*" = "" ]; then |