summaryrefslogtreecommitdiffstats
path: root/auth/auth-cass
diff options
context:
space:
mode:
Diffstat (limited to 'auth/auth-cass')
-rw-r--r--auth/auth-cass/cass_init/cmd.sh49
-rw-r--r--auth/auth-cass/docker/Dockerfile.cass2
-rw-r--r--auth/auth-cass/docker/dbuild.sh1
-rw-r--r--auth/auth-cass/docker/dinstall.sh4
-rw-r--r--auth/auth-cass/docker/drun.sh2
5 files changed, 45 insertions, 13 deletions
diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh
index 056faed7..09379730 100644
--- a/auth/auth-cass/cass_init/cmd.sh
+++ b/auth/auth-cass/cass_init/cmd.sh
@@ -2,12 +2,24 @@
#
# Engage normal Cass Init, then check for data installation
#
+DIR="/opt/app/aaf/status"
+
if [ ! -e /aaf_cmd ]; then
ln -s /opt/app/aaf/cass_init/cmd.sh /aaf_cmd
chmod u+x /aaf_cmd
fi
+function status {
+ if [ -d "$DIR" ]; then
+ echo "$@"
+ echo "$@" > $DIR/aaf_cass
+ fi
+}
+
function install_cql {
+ status install
+ sleep 10
+ status wait for cassandra to start
# 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
@@ -27,25 +39,23 @@ function install_cql {
cd /opt/app/aaf/cass_init
echo " cqlsh -f keyspace.cql"
/usr/bin/cqlsh -f keyspace.cql
+ status keyspace installed
echo " cqlsh -f init.cql"
/usr/bin/cqlsh -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"
fi
fi
+ status $1
}
-case "$1" in
- start)
- # Startup like normal
- echo "Cassandra Startup"
- /usr/local/bin/docker-entrypoint.sh
- ;;
- onap)
- install_cql
+function install_onap {
+ install_cql initialized
# Change date expiring dat files to more recent
+ status Creating ONAP Identities
ID_FILE=/opt/app/aaf/cass_init/sample.identities.dat
if [ -e $ID_FILE ]; then
DATE=$(date "+%Y-%m-%d %H:%M:%S.000+0000" -d "+6 months")
@@ -77,13 +87,34 @@ case "$1" in
done
# Change UserRole
+ status Setting up User Roles
mv dats/user_role.dat tmp
sed "s/\(^.*|\)\(.*|\)\(.*|\)\(.*\)/\1${DATE}|\3\4/" tmp > dats/user_role.dat
# Remove ID File, which is marker for initializing Creds
rm $ID_FILE
fi
- bash push.sh
+ status Pushing data to cassandra
+ bash push.sh
+ status ready
+}
+
+case "$1" in
+ start)
+ # start install_cql in background, waiting for process to start
+ install_cql ready &
+
+ # Startup like normal
+ echo "Cassandra Startup"
+ /usr/local/bin/docker-entrypoint.sh
+ ;;
+ onap)
+ # start install_onap (which calls install_cql first) in background, waiting for process to start
+ install_onap &
+
+ # Startup like normal
+ echo "Cassandra Startup"
+ /usr/local/bin/docker-entrypoint.sh
;;
esac
diff --git a/auth/auth-cass/docker/Dockerfile.cass b/auth/auth-cass/docker/Dockerfile.cass
index 1f2b2b13..d4487f9d 100644
--- a/auth/auth-cass/docker/Dockerfile.cass
+++ b/auth/auth-cass/docker/Dockerfile.cass
@@ -13,5 +13,5 @@ COPY sample.identities.dat /opt/app/aaf/cass_init/
ENTRYPOINT ["/bin/bash","/opt/app/aaf/cass_init/cmd.sh"]
CMD ["start"]
-# Default is to start up like normal
+# Default is to start up with CQL setup only
diff --git a/auth/auth-cass/docker/dbuild.sh b/auth/auth-cass/docker/dbuild.sh
index f26d73a5..aeef3293 100644
--- a/auth/auth-cass/docker/dbuild.sh
+++ b/auth/auth-cass/docker/dbuild.sh
@@ -20,6 +20,7 @@ cp sample/data/sample.identities.dat auth-cass
docker build -t ${ORG}/${PROJECT}/aaf_cass:${VERSION} auth-cass
docker tag ${ORG}/${PROJECT}/aaf_cass:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_cass:${VERSION}
+docker tag ${ORG}/${PROJECT}/aaf_cass:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_cass:latest
cd -
rm Dockerfile
diff --git a/auth/auth-cass/docker/dinstall.sh b/auth/auth-cass/docker/dinstall.sh
index 045d5f2f..c21b7fcc 100644
--- a/auth/auth-cass/docker/dinstall.sh
+++ b/auth/auth-cass/docker/dinstall.sh
@@ -2,6 +2,6 @@
. drun.sh
-echo $DOCKER
-docker exec -it aaf_cass bash aaf_cmd onap
+# echo $DOCKER
+# docker exec -it aaf_cass bash aaf_cmd onap
diff --git a/auth/auth-cass/docker/drun.sh b/auth/auth-cass/docker/drun.sh
index 4e56ce18..081411b3 100644
--- a/auth/auth-cass/docker/drun.sh
+++ b/auth/auth-cass/docker/drun.sh
@@ -31,7 +31,7 @@ if [ "`$DOCKER ps -a | grep aaf_cass`" == "" ]; then
-e CASSANDRA_DC=dc1 \
-e CASSANDRA_CLUSTER_NAME=osaaf \
--mount 'type=volume,src=aaf_cass_data,dst=/var/lib/cassandra,volume-driver=local' \
- -d ${PREFIX}${ORG}/${PROJECT}/aaf_cass:${VERSION}
+ -d ${PREFIX}${ORG}/${PROJECT}/aaf_cass:${VERSION} "onap"
else
$DOCKER start aaf_cass
fi