diff options
| author |   Instrumental <jgonap@stl.gathman.org> | 2020-03-18 15:58:01 -0500 |
|---|---|---|
| committer | Instrumental <jgonap@stl.gathman.org> | 2020-03-18 15:58:44 -0500 |
| commit | eeb50d3b600eb5c781c53cb6f9519e503e22ca6d (patch) | |
| tree | d5fc9fc4220cd90b02046492b54399e42ae5609f /auth/auth-cass | |
| parent | 14b5b259a28045ae08515d643af3381aac148b86 (diff) | |
Fix Cass, then to Version 2.1.19
Issue-ID: AAF-1081
Signed-off-by: Instrumental <jgonap@stl.gathman.org>
Change-Id: I5ca5779813b6120dfb6c13768abab4855ad26c35
Diffstat (limited to 'auth/auth-cass')
| -rw-r--r-- | auth/auth-cass/cass_init/cmd.sh | 12 | ||||
| -rw-r--r-- | auth/auth-cass/cass_init/restore.sh | 2 | ||||
| -rw-r--r-- | auth/auth-cass/pom.xml | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh index b6650122..dc3e7f80 100644 --- a/auth/auth-cass/cass_init/cmd.sh +++ b/auth/auth-cass/cass_init/cmd.sh @@ -71,7 +71,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 "$(/usr/bin/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 +96,11 @@ function wait_ready { function install_cql { wait_start cassandra responsive # Now, make sure data exists - if [ ! -e $INSTALLED_VERSION ] && [ -n "$(/usr/bin/cqlsh -e 'describe keyspaces' | grep authz)" ]; then - /usr/bin/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 "`/usr/bin/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 +109,10 @@ function install_cql { echo " cd /opt/app/aaf/cass_init" cd /opt/app/aaf/cass_init echo " cqlsh -f keyspace.cql" - /usr/bin/cqlsh --request-timeout=100 -f keyspace.cql + cqlsh --request-timeout=100 -f keyspace.cql status keyspace installed echo " cqlsh -f init.cql" - /usr/bin/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 a2c02929..528978af 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="/usr/bin/cqlsh -k authz" +CQLSH="cqlsh -k authz" cd dats if [ "$*" = "" ]; then diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index 0e5e6740..f346826a 100644 --- a/auth/auth-cass/pom.xml +++ b/auth/auth-cass/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.18-SNAPSHOT</version> + <version>2.1.19-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> |