commit be7e0d14765b8fb1520c457ab99ddedf0f7ab65e
author Instrumental <jonathan.gathman@att.com> Thu Apr 04 21:42:19 2019 -0500
committer Instrumental <jonathan.gathman@att.com> Fri Apr 05 07:54:42 2019 -0500
tree cb2c544275dbb905d07239798bdbef8dbcb8c8df
parent 08755cae37030d74d8fcadf38f9919c9d9fd21c0

Refine Helm Client Charts

Issue-ID: AAF-802
Change-Id: Ie00cd2919eeecef00aac1dae139c7ef80092589a
Signed-off-by: Instrumental <jonathan.gathman@att.com>

auth/docker/aaf.sh

diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh
index 02d258f..656ce56 100644
--- a/auth/docker/aaf.sh
+++ b/auth/docker/aaf.sh
@@ -38,7 +38,7 @@
     --env aaf_locator_container_ns=${NAMESPACE} \
     --env aaf_locator_fqdn=${HOSTNAME} \
     --env aaf_locate_url=https://aaf-locate:8095 \
-    --env aaf_locator_public_hostname=${HOSTNAME} \
+    --env aaf_locator_public_fqdn=${HOSTNAME} \
     --env AAF_ENV=${AAF_ENV} \
     --env LATITUDE=${LATITUDE} \
     --env LONGITUDE=${LONGITUDE} \

auth/docker/agent.sh

diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh
index 931249b..eb1888c 100644
--- a/auth/docker/agent.sh
+++ b/auth/docker/agent.sh
@@ -120,6 +120,7 @@
     --env LATITUDE=${LATITUDE} \
     --env LONGITUDE=${LONGITUDE} \
     --env aaf_locator_container_ns=${CONTAINER_NS} \
+    --env aaf_locator_container=docker \
     --name aaf-agent-$USER \
     "$PREFIX"onap/aaf/aaf_agent:$VERSION \
     bash -c "bash /opt/app/aaf_config/bin/agent.sh $PARAMS"

auth/docker/dbuild.sh

diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh
index 1b4e5ee..fab4b15 100755
--- a/auth/docker/dbuild.sh
+++ b/auth/docker/dbuild.sh
@@ -28,8 +28,6 @@
 
 . ./d.props
 
-AAF_COMPONENTS=ALL
-
 # process input. originally, an optional positional parameter is used to designate a component.
 # A flagged parameter has been added to optionally indicate docker pull registry. Ideally, options
 # would be flagged but we're avoiding ripple effect of changing original usage
@@ -124,9 +122,7 @@
 #######
 # Do all the Containers related to AAF Services
 #######
-if [ $AAF_COMPONENTS == "ALL" ]; then
-    AAF_COMPONENTS=$(cat components)
-fi
+AAF_COMPONENTS=$(cat components)
 
 cp ../sample/bin/pod_wait.sh  ../aaf_${VERSION}/bin
 for AAF_COMPONENT in ${AAF_COMPONENTS}; do

auth/docker/drun.sh

diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index 994bb55..648c497 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -105,7 +105,7 @@
         --env aaf_locator_container=docker \
         --env aaf_locator_container_ns=${NAMESPACE} \
         --env aaf_locator_fqdn=${HOSTNAME} \
-        --env aaf_locator_public_hostname=${HOSTNAME} \
+        --env aaf_locator_public_fqdn=${HOSTNAME} \
         --env LATITUDE=${LATITUDE} \
         --env LONGITUDE=${LONGITUDE} \
         --env CASSANDRA_CLUSTER=${CASSANDRA_CLUSTER} \