commit 146332e349416ac0b3c9653b0ae68d55dbb3f9de
author Jens Harbott <j.harbott@x-ion.de> Wed Sep 20 06:18:08 2017 +0000
committer Jens Harbott <j.harbott@x-ion.de> Wed Sep 20 08:56:51 2017 +0000
tree e7fb69b9cfd7e3409fb8e8670d472a63fceb54dc
parent 7617ac208596665061453dfa04b75e4cc8a76ac9

Make etcd3 setup work with IPv6 addresses

The client are told to connect to SERVICE_HOST instead of HOST_IP, so
we need to start etcd3 with matching listening parameters.

Change-Id: I96389090180d21d25d72df8f9e8905b850bcaee9
Partial-Bug: 1656329

lib/etcd3

diff --git a/lib/etcd3 b/lib/etcd3
index 60e827a..e6a04f1 100644
--- a/lib/etcd3
+++ b/lib/etcd3
@@ -40,9 +40,13 @@
     cmd+=" --initial-cluster-state new --initial-cluster-token etcd-cluster-01"
     cmd+=" --initial-cluster $HOSTNAME=http://$SERVICE_HOST:2380"
     cmd+=" --initial-advertise-peer-urls http://$SERVICE_HOST:2380"
-    cmd+=" --advertise-client-urls http://${HOST_IP}:$ETCD_PORT"
-    cmd+=" --listen-peer-urls http://0.0.0.0:2380 "
-    cmd+=" --listen-client-urls http://${HOST_IP}:$ETCD_PORT"
+    cmd+=" --advertise-client-urls http://$SERVICE_HOST:$ETCD_PORT"
+    if [ "$SERVICE_LISTEN_ADDRESS" == "::" ]; then
+        cmd+=" --listen-peer-urls http://[::]:2380 "
+    else
+        cmd+=" --listen-peer-urls http://0.0.0.0:2380 "
+    fi
+    cmd+=" --listen-client-urls http://$SERVICE_HOST:$ETCD_PORT"
 
     local unitfile="$SYSTEMD_DIR/$ETCD_SYSTEMD_SERVICE"
     write_user_unit_file $ETCD_SYSTEMD_SERVICE "$cmd" "" "root"