From: Instrumental <jonathan.gathman@att.com>
Date: Tue, 25 Sep 2018 12:56:54 +0000 (-0500)
Subject: HOSTNAME env for Install
X-Git-Tag: 2.1.2~24
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=commitdiff_plain;h=54883b4545dc32a5e4c7fbe0a49ef5b89a615435

HOSTNAME env for Install

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

diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh
index 1290ea78..3fc41496 100644
--- a/auth/docker/aaf.sh
+++ b/auth/docker/aaf.sh
@@ -6,6 +6,7 @@ function run_it() {
     --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 HOSTNAME=${HOSTNAME} \
     --env AAF_ENV=${AAF_ENV} \
     --env AAF_REGISTER_AS=${AAF_REGISTER_AS} \
     --env LATITUDE=${LATITUDE} \
diff --git a/conf/CA/bootstrap.sh b/conf/CA/bootstrap.sh
index 7d89b35c..10290075 100644
--- a/conf/CA/bootstrap.sh
+++ b/conf/CA/bootstrap.sh
@@ -13,7 +13,7 @@ if [ ! -e ./serial ]; then
 fi
 
 NAME=aaf.bootstrap
-FQDN=$(hostname -f)
+FQDN="${HOSTNAME:=$(hostname -f)}"
 FQI=aaf@aaf.osaaf.org
 SUBJECT="/CN=$FQDN/OU=$FQI`cat subject.aaf`"
 SIGNER_P12=$1