Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
AAF non-root
[aaf/authz.git]
/
auth
/
auth-cass
/
cass_init
/
cmd.sh
diff --git
a/auth/auth-cass/cass_init/cmd.sh
b/auth/auth-cass/cass_init/cmd.sh
index
dc3e7f8
..
f605a47
100644
(file)
--- 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
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
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
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"
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
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
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 "
status install
echo "Initializing Cassandra DB"
echo "Docker Installed Basic Cassandra on aaf.cass. Executing the following "
@@
-109,15
+110,15
@@
function install_cql {
echo " cd /opt/app/aaf/cass_init"
cd /opt/app/aaf/cass_init
echo " cqlsh -f keyspace.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"
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"
echo " cqlsh -f temp_identity.cql"
status data initialized
echo ""
echo "The following will give you a temporary identity with which to start working, or emergency"
echo " cqlsh -f temp_identity.cql"
- echo "
casablanca
" > $INSTALLED_VERSION
+ echo "
frankfurt
" > $INSTALLED_VERSION
else
echo "Cassandra DB already includes 'authz' keyspace"
fi
else
echo "Cassandra DB already includes 'authz' keyspace"
fi
@@
-135,7
+136,8
@@
function install_onap {
status prep data
bash prep.sh
status push data to cassandra
status prep data
bash prep.sh
status push data to cassandra
- bash push.sh
+ # bash push.sh
+ echo "YES" | bash restore.sh
cd -
echo $(date) > $AAF_INIT_DATA
fi
cd -
echo $(date) > $AAF_INIT_DATA
fi