update NOMAD_ADDR env var (#261)

* update NOMAD_ADDR env var

* Update nomad-aws/template/nomad-startup.sh.tpl

Co-authored-by: Chris Stephen <chris.stephen@circleci.com>

* update NOMAD_ADDR

* update display env var

* source /etc/environment file

---------

Co-authored-by: Chris Stephen <chris.stephen@circleci.com>

Author: atulsingh0

nomad-aws/modules/nomad-server-aws/templates/nomad-server-startup.sh.tpl

@@ -30,6 +30,9 @@ echo 'export NOMAD_CLIENT_CERT=/etc/ssl/nomad/server.pem' >> /etc/environment
 echo 'export NOMAD_CLIENT_KEY=/etc/ssl/nomad/key.pem' >> /etc/environment
 echo "export NOMAD_ADDR=https://localhost:4646" >> /etc/environment
 
+source /etc/environment
+env | grep "NOMAD_"
+
 echo "----------------------------------------"
 echo "        Tuning kernel parameters"
 echo "----------------------------------------"
@@ -149,6 +152,7 @@ ExecStart=/usr/bin/nomad agent -config /etc/nomad/server.hcl
 WantedBy=multi-user.target
 EOT
 
+
 echo "--------------------------------------"
 echo "      Starting Nomad service"
 echo "--------------------------------------"

nomad-aws/template/nomad-startup.sh.tpl

@@ -26,7 +26,12 @@ echo "--------------------------------------"
 echo 'export NOMAD_CACERT=/etc/ssl/nomad/ca.pem' >> /etc/environment
 echo 'export NOMAD_CLIENT_CERT=/etc/ssl/nomad/client.pem' >> /etc/environment
 echo 'export NOMAD_CLIENT_KEY=/etc/ssl/nomad/key.pem' >> /etc/environment
-echo "export NOMAD_ADDR=https://localhost:4646" >> /etc/environment
+
+[ "${external_nomad_server}" == "true" ] && SCHEME="https" || SCHEME="http"
+echo "export NOMAD_ADDR=$SCHEME://localhost:4646" >> /etc/environment
+
+source /etc/environment
+env | grep "NOMAD_"
 
 retry() {
     local -r -i max_attempts=5
@@ -221,7 +226,7 @@ Description="nomad"
 Environment="NOMAD_CACERT=/etc/ssl/nomad/ca.pem"
 Environment="NOMAD_CLIENT_CERT=/etc/ssl/nomad/client.pem"
 Environment="NOMAD_CLIENT_KEY=/etc/ssl/nomad/key.pem"
-Environment="NOMAD_ADDR=https://localhost:4646"
+Environment="NOMAD_ADDR=$NOMAD_ADDR"
 Restart=always
 RestartSec=30
 TimeoutStartSec=1m

nomad-gcp/modules/nomad-server-gcp/templates/nomad-server-startup.sh.tpl

@@ -80,6 +80,9 @@ configure_nomad() {
 	echo 'export NOMAD_CLIENT_CERT=/etc/ssl/nomad/server.pem' >> /etc/environment
 	echo 'export NOMAD_CLIENT_KEY=/etc/ssl/nomad/key.pem' >> /etc/environment
 	echo "export NOMAD_ADDR=https://localhost:4646" >> /etc/environment	
+
+	source /etc/environment
+	env | grep "NOMAD_"
 	##########################################################################
 
 
@@ -134,6 +137,7 @@ configure_nomad() {
 	EOT
 	##########################################################################
 
+	log ""
 
 
 	log "-----------------------------------------"
@@ -161,6 +165,7 @@ configure_nomad() {
 	log "-----------------------------------------"
 
 	log ""
+
 	log "Starting up nomad"
 	systemctl enable --now nomad
 }

nomad-gcp/templates/nomad-startup.sh.tpl

@@ -140,7 +140,12 @@ configure_nomad() {
 	echo 'export NOMAD_CACERT=/etc/ssl/nomad/ca.pem' >> /etc/environment
 	echo 'export NOMAD_CLIENT_CERT=/etc/ssl/nomad/client.pem' >> /etc/environment
 	echo 'export NOMAD_CLIENT_KEY=/etc/ssl/nomad/key.pem' >> /etc/environment
-	echo "export NOMAD_ADDR=https://localhost:4646" >> /etc/environment
+
+	[ "${external_nomad_server}" == "true" ] && SCHEME="https" || SCHEME="http"
+	echo "export NOMAD_ADDR=$SCHEME://localhost:4646" >> /etc/environment
+
+	source /etc/environment
+	env | grep "NOMAD_"
 
 	log "Setting nomad configuration"
 	mkdir -p /etc/nomad
@@ -215,6 +220,7 @@ configure_nomad() {
 	fi
 	ls -l /etc/nomad/client.hcl
 
+
 	log "Writing nomad systemd unit"
 	cat <<-EOT > /etc/systemd/system/nomad.service
 	[Unit]
@@ -223,7 +229,7 @@ configure_nomad() {
 	Environment="NOMAD_CACERT=/etc/ssl/nomad/ca.pem"
 	Environment="NOMAD_CLIENT_CERT=/etc/ssl/nomad/client.pem"
 	Environment="NOMAD_CLIENT_KEY=/etc/ssl/nomad/key.pem"
-	Environment="NOMAD_ADDR=https://localhost:4646"
+	Environment="NOMAD_ADDR=$NOMAD_ADDR"
 	Restart=always
 	RestartSec=30
 	TimeoutStartSec=1m