move to bind expression

devopsftw · Feb 6, 2018 · ab4af2c · ab4af2c
1 parent f42e7fb
commit ab4af2c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/init.d/01_consul.sh b/init.d/01_consul.sh
@@ -25,10 +25,12 @@ if [ "$PAIR" = "" ]; then
     exit 1
 fi
 
-if [ -z $CONSUL_BIND ]; then
-    echo '0.0.0.0' > /etc/container_environment/CONSUL_BIND
+if [ -z "$CONSUL_BIND_EXPR" ]; then
+    echo "Consul bind address expression not set, use default"
+    CONSUL_BIND_EXPR='"0.0.0.0"'
+    echo $CONSUL_BIND_EXPR > /etc/container_environment/CONSUL_BIND_EXPR
 fi
-echo "Bind consul to $CONSUL_BIND"
+echo "Consul bind address expression set to $CONSUL_BIND_EXPR"
 
 DC=$(echo $PAIR | cut -f1 -d " ")
 DOMAIN=$(echo $PAIR | cut -f2 -d " ")

diff --git a/services/consul.sh b/services/consul.sh
@@ -2,7 +2,7 @@
 
 exec /usr/local/bin/consul agent \
     -retry-join $CONSUL_HOST \
-    -bind $CONSUL_BIND \
+    -bind "{{ $CONSUL_BIND_EXPR }}" \
     -datacenter $CONSUL_DC \
     -domain $CONSUL_DOMAIN \
     -config-file /etc/consul/consul.json \