Browse code

Merge "Expose etcd port as a variable"

Jenkins authored on 2017/06/06 03:28:11
Showing 1 changed files
... ...
@@ -33,6 +33,7 @@ ETCD_SHA256_AMD64="4fde194bbcd259401e2b5c462dfa579ee7f6af539f13f130b8f5b4f52e3b3
33 33
 # NOTE(sdague): etcd v3.1.7 doesn't have anything for these architectures, though 3.2.0 does.
34 34
 ETCD_SHA256_ARM64=""
35 35
 ETCD_SHA256_PPC64=""
36
+ETCD_PORT=2379
36 37
 
37 38
 if is_ubuntu ; then
38 39
     UBUNTU_RELEASE_BASE_NUM=`lsb_release -r | awk '{print $2}' | cut -d '.' -f 1`
... ...
@@ -52,9 +53,9 @@ function start_etcd3 {
52 52
     cmd+=" --initial-cluster-state new --initial-cluster-token etcd-cluster-01"
53 53
     cmd+=" --initial-cluster $HOSTNAME=http://$SERVICE_HOST:2380"
54 54
     cmd+=" --initial-advertise-peer-urls http://$SERVICE_HOST:2380"
55
-    cmd+=" --advertise-client-urls http://$SERVICE_HOST:2379"
55
+    cmd+=" --advertise-client-urls http://$SERVICE_HOST:$ETCD_PORT"
56 56
     cmd+=" --listen-peer-urls http://0.0.0.0:2380 "
57
-    cmd+=" --listen-client-urls http://$SERVICE_HOST:2379"
57
+    cmd+=" --listen-client-urls http://$SERVICE_HOST:$ETCD_PORT"
58 58
 
59 59
     local unitfile="$SYSTEMD_DIR/$ETCD_SYSTEMD_SERVICE"
60 60
     write_user_unit_file $ETCD_SYSTEMD_SERVICE "$cmd" "" "root"