From 4d7da3d5edf32a424d786b83fbdb89a1f57451ac Mon Sep 17 00:00:00 2001 From: Instrumental Date: Fri, 6 Apr 2018 08:22:42 -0500 Subject: Fix Locate Cassandra config issue Issue-ID: AAF-216 Change-Id: I52719ee951a5135be5561fca6ab71744a014fe41 Signed-off-by: Instrumental --- auth/auth-cass/docker/dbash | 3 --- auth/auth-cass/docker/dbash.sh | 3 +++ auth/auth-cass/docker/dinstall | 29 ----------------------------- auth/auth-cass/docker/dinstall.sh | 31 +++++++++++++++++++++++++++++++ auth/auth-cass/src/main/cql/keyspace.cql | 6 ++++-- auth/docker/d.props | 2 +- auth/docker/dbash.sh | 2 +- auth/docker/dstart.sh | 12 ++++++++++++ 8 files changed, 52 insertions(+), 36 deletions(-) delete mode 100644 auth/auth-cass/docker/dbash create mode 100644 auth/auth-cass/docker/dbash.sh delete mode 100644 auth/auth-cass/docker/dinstall create mode 100644 auth/auth-cass/docker/dinstall.sh create mode 100644 auth/docker/dstart.sh (limited to 'auth') diff --git a/auth/auth-cass/docker/dbash b/auth/auth-cass/docker/dbash deleted file mode 100644 index e10afcc0..00000000 --- a/auth/auth-cass/docker/dbash +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash dbash -docker exec -it aaf_cass bash - diff --git a/auth/auth-cass/docker/dbash.sh b/auth/auth-cass/docker/dbash.sh new file mode 100644 index 00000000..e10afcc0 --- /dev/null +++ b/auth/auth-cass/docker/dbash.sh @@ -0,0 +1,3 @@ +#!/bin/bash dbash +docker exec -it aaf_cass bash + diff --git a/auth/auth-cass/docker/dinstall b/auth/auth-cass/docker/dinstall deleted file mode 100644 index aaa507b7..00000000 --- a/auth/auth-cass/docker/dinstall +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash dinstall -if ["`docker ps -a | grep aaf_cass`" == ""]; then - docker run --name aaf_cass -d cassandra:3.11 -else - docker exec aaf_cass mkdir -p /opt/app/cass_init - docker cp "../src/main/cql/." aaf_cass:/opt/app/cass_init -fi - -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 -u root -p root -f keyspace.cql" -echo " cqlsh -u root -p root -f init.cql" -echo " cqlsh -u root -p root -f osaaf.cql" -echo "" -echo "The following will give you a temporary identity with which to start working, or emergency" -echo " cqlsh -u root -p root -f temp_identity.cql" -echo "Sleeping 10 seconds to allow Cassandra to start" -sleep 10 -docker exec -it aaf_cass bash -c '\ -cd /opt/app/cass_init; \ -echo "Creating Keyspace";cqlsh -u root -p root -f keyspace.cql;\ -echo "Creating init";cqlsh -u root -p root -f init.cql;\ -echo "Creating osaaf";cqlsh -u root -p root -f osaaf.cql;\ -echo "Creating temp Identity";cqlsh -u root -p root -f temp_identity.cql' - -echo "Inspecting aafcassadra. Use to get the IP address to update org.osaaf.cassandra.props" -docker inspect aaf_cass | grep '"IPAddress' | head -1 diff --git a/auth/auth-cass/docker/dinstall.sh b/auth/auth-cass/docker/dinstall.sh new file mode 100644 index 00000000..9362896d --- /dev/null +++ b/auth/auth-cass/docker/dinstall.sh @@ -0,0 +1,31 @@ +#!/bin/bash dinstall +if ["`docker ps -a | grep aaf_cass`" == ""]; then + docker run --name aaf_cass -d cassandra:3.11 + echo "Check for running Docker Container aaf_cass, then run again." + exit +else + docker exec aaf_cass mkdir -p /opt/app/cass_init + docker cp "../src/main/cql/." aaf_cass:/opt/app/cass_init +fi + +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 -u root -p root -f keyspace.cql" +echo " cqlsh -u root -p root -f init.cql" +echo " cqlsh -u root -p root -f osaaf.cql" +echo "" +echo "The following will give you a temporary identity with which to start working, or emergency" +echo " cqlsh -u root -p root -f temp_identity.cql" +echo "Sleeping for 10 seconds" +sleep 10 +docker exec -it aaf_cass bash -c '\ +cd /opt/app/cass_init; \ +echo "Creating Keyspace";cqlsh -u root -p root -f keyspace.cql;\ +echo "Creating init";cqlsh -u root -p root -f init.cql;\ +echo "Creating osaaf";cqlsh -u root -p root -f osaaf.cql;\ +echo "Creating temp Identity";cqlsh -u root -p root -f temp_identity.cql' + +echo "Inspecting aafcassadra. Use to get the IP address to update org.osaaf.cassandra.props" +docker inspect aaf_cass | grep '"IPAddress' | head -1 diff --git a/auth/auth-cass/src/main/cql/keyspace.cql b/auth/auth-cass/src/main/cql/keyspace.cql index ad58090f..52dc5ea7 100644 --- a/auth/auth-cass/src/main/cql/keyspace.cql +++ b/auth/auth-cass/src/main/cql/keyspace.cql @@ -1,9 +1,11 @@ // For Developer Machine single instance -CREATE KEYSPACE authz - WITH REPLICATION = {'class' : 'SimpleStrategy','replication_factor':1}; +// CREATE KEYSPACE authz +// WITH REPLICATION = {'class' : 'SimpleStrategy','replication_factor':1}; // // // Example of Network Topology, with Datacenter dc1 & dc2 // CREATE KEYSPACE authz WITH replication = { 'class': 'NetworkTopologyStrategy', 'dc1': '2', 'dc2': '2' }; +// Out of the box Docker Cassandra comes with "datacenter1", one instance +CREATE KEYSPACE authz WITH replication = { 'class': 'NetworkTopologyStrategy', 'datacenter1': '1' }; // diff --git a/auth/docker/d.props b/auth/docker/d.props index 90bc5511..6fc232ee 100644 --- a/auth/docker/d.props +++ b/auth/docker/d.props @@ -8,6 +8,6 @@ CONF_ROOT_DIR=/opt/app/osaaf # Local Env info HOSTNAME=meriadoc.mithril.sbc.com HOST_IP=172.17.0.3 -CASS_HOST="cass.aaf.osaaf.org:172.17.0.2" +CASS_HOST=cass.aaf.osaaf.org:172.17.0.2 diff --git a/auth/docker/dbash.sh b/auth/docker/dbash.sh index da166b5c..642cba40 100644 --- a/auth/docker/dbash.sh +++ b/auth/docker/dbash.sh @@ -1 +1 @@ -docker exec -it aaf bash \ No newline at end of file +docker exec -it aaf_$1 bash diff --git a/auth/docker/dstart.sh b/auth/docker/dstart.sh new file mode 100644 index 00000000..9fcc328b --- /dev/null +++ b/auth/docker/dstart.sh @@ -0,0 +1,12 @@ +#!/bin/bash dstop.sh +. d.props + +if [ "$1" == "" ]; then + AAF_COMPONENTS=`ls -r ../aaf_${VERSION}/bin | grep -v '\.'` +else + AAF_COMPONENTS=$1 +fi + +for AAF_COMPONENT in ${AAF_COMPONENTS}; do + docker start aaf_$AAF_COMPONENT +done -- cgit 1.2.3-korg