summaryrefslogtreecommitdiffstats
path: root/auth/docker
diff options
context:
space:
mode:
Diffstat (limited to 'auth/docker')
-rw-r--r--auth/docker/aaf.sh2
-rw-r--r--auth/docker/agent.sh1
-rwxr-xr-xauth/docker/dbuild.sh6
-rw-r--r--auth/docker/drun.sh2
4 files changed, 4 insertions, 7 deletions
diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh
index 02d258f8..656ce56c 100644
--- a/auth/docker/aaf.sh
+++ b/auth/docker/aaf.sh
@@ -38,7 +38,7 @@ function run_it() {
--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} \
diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh
index 931249b0..eb1888c1 100644
--- a/auth/docker/agent.sh
+++ b/auth/docker/agent.sh
@@ -120,6 +120,7 @@ function run_it() {
--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"
diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh
index 1b4e5eee..fab4b15a 100755
--- a/auth/docker/dbuild.sh
+++ b/auth/docker/dbuild.sh
@@ -28,8 +28,6 @@ fi
. ./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 @@ cd -
#######
# 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
diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index 994bb556..648c497a 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -105,7 +105,7 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
--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} \