summaryrefslogtreecommitdiffstats
path: root/auth/auth-cass/cass_init
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-10-03 19:40:44 -0500
committerInstrumental <jonathan.gathman@att.com>2018-10-03 19:41:20 -0500
commit1e3be601c78fa851333e51c6498713d1c412bd62 (patch)
tree20d56a99089f6f6d3acd055e2522675c85457ebb /auth/auth-cass/cass_init
parent7e97d0c2c5a10e92d1233117bb60bfd9e42d35a0 (diff)
Change FQDN Register
Issue-ID: AAF-517 Change-Id: I816e7a18f94e7f7fcfc269b29328d7009fc8f858 Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/auth-cass/cass_init')
-rw-r--r--auth/auth-cass/cass_init/cmd.sh44
1 files changed, 34 insertions, 10 deletions
diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh
index 09379730..afb66774 100644
--- a/auth/auth-cass/cass_init/cmd.sh
+++ b/auth/auth-cass/cass_init/cmd.sh
@@ -16,20 +16,36 @@ function status {
fi
}
-function install_cql {
- status install
+function wait_start {
sleep 10
status wait for cassandra to start
+ for CNT in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+ if [ -z "$(grep 'listening for CQL clients' /var/log/cassandra/system.log)" ]; then
+ echo "Waiting for Cassandra to start... Sleep 10"
+ sleep 10
+ else
+ break
+ fi
+ done
+}
+
+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
+ break
+ else
+ echo "Waiting for Keyspaces to be loaded... Sleep 10"
+ sleep 10
+ fi
+ done
+}
+
+function install_cql {
+ wait_start started
# Now, make sure data exists
if [ "$(/usr/bin/cqlsh -e 'describe keyspaces' | grep authz)" = "" ]; then
- for CNT in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
- if [ -z "$(grep 'listening for CQL clients' /var/log/cassandra/system.log)" ]; then
- echo "Waiting for Cassandra to start... Sleep 10"
- sleep 10
- else
- break
- fi
- done
+ status install
echo "Initializing Cassandra DB"
if [ "`/usr/bin/cqlsh -e 'describe keyspaces' | grep authz`" == "" ]; then
echo "Docker Installed Basic Cassandra on aaf_cass. Executing the following "
@@ -108,6 +124,14 @@ case "$1" in
echo "Cassandra Startup"
/usr/local/bin/docker-entrypoint.sh
;;
+ wait)
+ # Wait for initialization. This can be called from Docker only as a check to make sure it is ready
+ wait_start started
+
+ # Make sure Keyspace is loaded
+ wait_cql
+ status ready
+ ;;
onap)
# start install_onap (which calls install_cql first) in background, waiting for process to start
install_onap &