diff options
| -rw-r--r-- | auth/auth-cass/docker/dinstall.sh | 50 | ||||
| -rw-r--r-- | auth/docker/d.props | 6 |
2 files changed, 34 insertions, 22 deletions
diff --git a/auth/auth-cass/docker/dinstall.sh b/auth/auth-cass/docker/dinstall.sh index 8449fe17..44ee7130 100644 --- a/auth/auth-cass/docker/dinstall.sh +++ b/auth/auth-cass/docker/dinstall.sh @@ -1,13 +1,23 @@ #!/bin/bash -DOCKER=/usr/bin/docker +if [ -e /usr/bin/docker ]; then + DOCKER=/usr/bin/docker +elif [ -e /usr/local/bin/docker ]; then + DOCKER=/usr/local/bin/docker +else + echo Docker not available in /usr/bin or /usr/local/bin + exit +fi echo "Running DInstall" if [ "`$DOCKER ps -a | grep aaf_cass`" == "" ]; then echo "starting Cass from 'run'" - $DOCKER run --name aaf_cass -d cassandra:3.11 + # NOTE: These HEAP Sizes are minimal. Not set for full organizations. + $DOCKER run --name aaf_cass -e HEAP_NEWSIZE=512M -e MAX_HEAP_SIZE=1024M -e CASSANDRA_DC=dc1 -e CASSANDRA_CLUSTER_NAME=osaaf -d cassandra:3.11 + # Set on local Disk + # -v /opt/app/cass:/var/lib/cassandra echo "aaf_cass Starting" for CNT in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do if [ "`$DOCKER container logs aaf_cass | grep 'listening for CQL clients'`" == "" ]; then - echo "Sleep 10" + echo "Sleep 10" sleep 10 else break @@ -25,22 +35,24 @@ if [ "`$DOCKER ps -a | grep aaf_cass`" == "" ]; then echo "The following files are on /opt/app/cass_init dir on aaf_cass" $DOCKER exec aaf_cass ls /opt/app/cass_init - echo "Docker Installed Basic Cassandra on aaf_cass. Executing the following " - echo "NOTE: This creator provided is only a Single Instance. For more complex Cassandra, create independently" - echo "" - echo " cd /opt/app/cass_init" - echo " cqlsh -f keyspace.cql" - echo " cqlsh -f init.cql" - echo " cqlsh -f osaaf.cql" - echo "" - echo "The following will give you a temporary identity with which to start working, or emergency" - echo " cqlsh -f temp_identity.cql" - echo "Create Keyspaces and Tables" - $DOCKER exec aaf_cass bash /usr/bin/cqlsh -f /opt/app/cass_init/keyspace.cql - $DOCKER exec aaf_cass bash /usr/bin/cqlsh -e 'describe keyspaces' - $DOCKER exec aaf_cass bash /usr/bin/cqlsh -f /opt/app/cass_init/init.cql - $DOCKER exec aaf_cass bash /usr/bin/cqlsh -f /opt/app/cass_init/osaaf.cql - $DOCKER exec aaf_cass bash /usr/bin/cqlsh -f /opt/app/cass_init/temp_indentity.cql + if [ "`$DOCKER exec aaf_cass /usr/bin/cqlsh -e 'describe keyspaces' | grep authz`" == "" ]; then + echo "Docker Installed Basic Cassandra on aaf_cass. Executing the following " + echo "NOTE: This creator provided is only a Single Instance. For more complex Cassandra, create independently" + echo "" + echo " cd /opt/app/cass_init" + echo " cqlsh -f keyspace.cql" + echo " cqlsh -f init.cql" + echo " cqlsh -f osaaf.cql" + echo "" + echo "The following will give you a temporary identity with which to start working, or emergency" + echo " cqlsh -f temp_identity.cql" + echo "Create Keyspaces and Tables" + $DOCKER exec aaf_cass bash /usr/bin/cqlsh -f /opt/app/cass_init/keyspace.cql + $DOCKER exec aaf_cass bash /usr/bin/cqlsh -e 'describe keyspaces' + $DOCKER exec aaf_cass bash /usr/bin/cqlsh -f /opt/app/cass_init/init.cql + $DOCKER exec aaf_cass bash /usr/bin/cqlsh -f /opt/app/cass_init/osaaf.cql + $DOCKER exec aaf_cass bash /usr/bin/cqlsh -f /opt/app/cass_init/temp_identity.cql + fi else $DOCKER start aaf_cass fi diff --git a/auth/docker/d.props b/auth/docker/d.props index b955872a..00624514 100644 --- a/auth/docker/d.props +++ b/auth/docker/d.props @@ -6,8 +6,8 @@ VERSION=2.1.0-SNAPSHOT CONF_ROOT_DIR=/opt/app/osaaf # Local Env info -HOSTNAME=meriadoc.mithril.sbc.com -HOST_IP=192.168.99.100 -CASS_HOST=cass.aaf.osaaf.org:172.17.0.2 +HOSTNAME= +HOST_IP= +CASS_HOST= |