Merge "Config Container starts"
diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh
index f9cf1bc..7119727 100644
--- a/auth/docker/aaf.sh
+++ b/auth/docker/aaf.sh
@@ -1,8 +1,5 @@
#!/bin/bash
. ./d.props
-if [ -e ./cass.props ]; then
- . ./cass.props
-fi
DOCKER=${DOCKER:=docker}
function run_it() {
diff --git a/auth/docker/cass.props-e b/auth/docker/cass.props-e
deleted file mode 100644
index fc9bab4..0000000
--- a/auth/docker/cass.props-e
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-CASS_HOST=cass.aaf.osaaf.org:<Cass IP>
diff --git a/auth/docker/cass.props.init b/auth/docker/cass.props.init
deleted file mode 100644
index 7f7258f..0000000
--- a/auth/docker/cass.props.init
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Use for assigning to /etc/hosts, when DNS doesn't have Cassandra FQDN
-CASS_HOST=aaf_cass
-
-####
-# Detailed Cassandra Environmental Variables
-####
-# CASSANDRA_CLUSTER=<unsert means default, host from CASS_HOST above, or "localhost">
-# CASSANDRA_USER=<unset means default (cassandra)>
-# CASSANDRA_PASSWORD=<unset means default (cassandra)>
-# CASSANDRA_PORT=<unset means default (9042)>
diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init
index 9a1903f..b64ba1f 100644
--- a/auth/docker/d.props.init
+++ b/auth/docker/d.props.init
@@ -30,3 +30,10 @@
AAF_SIGNER_PASSWORD=
AAF_SIGNER_ALIAS=
+# OPTIONALLY ADD THESE CASSANDRA PROPERTIES
+# CASS_HOST=
+# CASSANDRA_CLUSTER=
+# CASSANDRA_USER=
+# CASSANDRA_PASSWORD=
+# CASSANDRA_PORT=
+
diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index c6914a0..ad1fb50 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -2,27 +2,8 @@
# Pull in Variables from d.props
. ./d.props
-# Only need Cassandra Link Info when initializing the container.
-if [ ! -e ./cass.props ]; then
- cp cass.props.init cass.props
-fi
-. ./cass.props
-
DOCKER=${DOCKER:=docker}
-CASS_IS_SET="$(grep '<Cass IP>' cass.props)"
-if [ -n "$CASS_IS_SET" ]; then
- CASS_IP="$($DOCKER container inspect aaf_cass | grep \"IPAddress\": -m 1 | cut -d '"' -f 4)"
- if [ -n "$CASS_IP" ]; then
- sed -i -e "s/\(^.*:\).*/\1$CASS_IP/" cass.props
- else
- echo "Set CASSASNDRA IP in cass.props"
- exit
- fi
-fi
-
-. ./cass.props
-
bash aaf.sh onap
if [ "$1" == "" ]; then
@@ -82,6 +63,11 @@
--env AAF_REGISTER_AS=${AAF_REGISTER_AS} \
--env LATITUDE=${LATITUDE} \
--env LONGITUDE=${LONGITUDE} \
+ --env CASS_HOST=${CASS_HOST} \
+ --env CASSANDRA_CLUSTER=${CASSANDRA_CLUSTER} \
+ --env CASSANDRA_USER=${CASSANDRA_USER} \
+ --env CASSANDRA_PASSWORD=${CASSANDRA_PASSWORD} \
+ --env CASSANDRA_PORT=${CASSANDRA_PORT} \
--publish $PORTMAP \
-v "aaf_config:$CONF_ROOT_DIR" \
${PREFIX}${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}
diff --git a/docs/index.rst b/docs/index.rst
index 0390857..d9f88f4 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -4,6 +4,10 @@
AAF - Application Authorization Framework
==================================================
+.. image:: https://bestpractices.coreinfrastructure.org/projects/2303/badge
+ :alt: CII Silver Badge
+ :target: https://bestpractices.coreinfrastructure.org/projects/2303
+
.. The purpose of AAF (Application Authorization Framework) is to organize software authorizations so that applications, tools and services can match the access needed to perform job functions.
AAF is designed to cover Fine-Grained Authorization, meaning that the Authorizations provided are able to used an Application's detailed authorizations, such as whether a user may be on a particular page, or has access to a particular Pub-SUB topic controlled within the App.