summaryrefslogtreecommitdiffstats
path: root/auth/docker
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-07-16 18:41:10 -0500
committerInstrumental <jonathan.gathman@att.com>2018-07-16 18:42:18 -0500
commit9c8a8b0926b13b07fb1e5394903401e7a3f1ff79 (patch)
tree29d65b58d4ebfc79e8d91752133c85d48699b71d /auth/docker
parent4ad4763d8c9191998cc671a884d1af5da6ba8bb9 (diff)
Changes from Testing AAF Config
Issue-ID: AAF-378 Change-Id: Icca28ee4e76b8329c7e068ba9305f9f647b6e479 Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/docker')
-rw-r--r--auth/docker/README.txt21
-rw-r--r--auth/docker/agent.sh4
-rw-r--r--auth/docker/d.props.init7
3 files changed, 25 insertions, 7 deletions
diff --git a/auth/docker/README.txt b/auth/docker/README.txt
index 32ed3489..3eb554b1 100644
--- a/auth/docker/README.txt
+++ b/auth/docker/README.txt
@@ -1,24 +1,33 @@
+#
+# Edit the following in <your ONAP authz dir>/auth/sample/local
+#
+aaf.props
+org.osaaf.aaf.cm.ca.props (leave out Password)
+
+# cd to main docker dir
+cd ../../docker
+
# Start the container in bash mode, so it stays up
sh agent.sh bash
-
# in another shell, find out your Container name
docker container ls | grep aaf_agent
+# CD to directory with CA info in it.
+# (example)
+cd /opt/app/osaaf/CA/intermediate_7
+
# copy keystore for this AAF Env
-docker container cp -L org.osaaf.aaf.p12 <Your Container>:/opt/app/osaaf/local
+docker container cp -L org.osaaf.aaf.p12 aaf_agent_<Your ID>:/opt/app/osaaf/local
# (in Agent Window)
agent encrypt cadi_keystore_password
# If you intend to use Certman to sign certs, it is a "local" CA
# copy Signing Keystore into container
-docker container cp -L org.osaaf.aaf.signer.p12 <Your Container>:/opt/app/osaaf/local
+docker container cp -L org.osaaf.aaf.signer.p12 aaf_agent_<Your ID>:/opt/app/osaaf/local
# (in Agent Window)
agent encrypt cm_ca.local
-# Add in Cassandra Password
-agent encrypt cassandra.clusters.password
-
# Check to make sure all passwords are set
grep "enc:" *.props
diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh
index f734c629..8636cdd1 100644
--- a/auth/docker/agent.sh
+++ b/auth/docker/agent.sh
@@ -7,6 +7,10 @@ docker run \
--mount 'type=volume,src=aaf_config,dst='$CONF_ROOT_DIR',volume-driver=local' \
--add-host="$HOSTNAME:$HOST_IP" \
--add-host="aaf.osaaf.org:$HOST_IP" \
+ --env AAF_ENV=${AAF_ENV} \
+ --env AAF_REGISTER_AS=${AAF_REGISTER_AS} \
+ --env LATITUDE=${LATITUDE} \
+ --env LONGITUDE=${LONGITUDE} \
--name aaf_agent_$USER \
${ORG}/${PROJECT}/aaf_config:${VERSION} \
/bin/bash "$@"
diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init
index d65c11bb..8691591c 100644
--- a/auth/docker/d.props.init
+++ b/auth/docker/d.props.init
@@ -8,5 +8,10 @@ CONF_ROOT_DIR=/opt/app/osaaf
# Local Env info
HOSTNAME=
HOST_IP=
-CASS_HOST=
+CASS_HOST=<cass FQDN>:<cass IP>
+# AAF Machine info
+aaf_env=DEV
+aaf_register_as=$HOSTNAME
+cadi_latitude=
+cadi_longitude=