Skip to content

Commit de85806

Browse files
author
Hongbin Lu
committed
Expose etcd port as a variable
This allows devstack plugins to retrieve the etcd port from devstack instead of hard-coding it. Change-Id: I106b559b8ac0fb99a0426bce97a27f67e32d264d
1 parent 793db3a commit de85806

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

lib/etcd3

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ ETCD_SHA256_AMD64="4fde194bbcd259401e2b5c462dfa579ee7f6af539f13f130b8f5b4f52e3b3
3333
# NOTE(sdague): etcd v3.1.7 doesn't have anything for these architectures, though 3.2.0 does.
3434
ETCD_SHA256_ARM64=""
3535
ETCD_SHA256_PPC64=""
36+
ETCD_PORT=2379
3637

3738
if is_ubuntu ; then
3839
UBUNTU_RELEASE_BASE_NUM=`lsb_release -r | awk '{print $2}' | cut -d '.' -f 1`
@@ -52,9 +53,9 @@ function start_etcd3 {
5253
cmd+=" --initial-cluster-state new --initial-cluster-token etcd-cluster-01"
5354
cmd+=" --initial-cluster $HOSTNAME=http://$SERVICE_HOST:2380"
5455
cmd+=" --initial-advertise-peer-urls http://$SERVICE_HOST:2380"
55-
cmd+=" --advertise-client-urls http://$SERVICE_HOST:2379"
56+
cmd+=" --advertise-client-urls http://$SERVICE_HOST:$ETCD_PORT"
5657
cmd+=" --listen-peer-urls http://0.0.0.0:2380 "
57-
cmd+=" --listen-client-urls http://$SERVICE_HOST:2379"
58+
cmd+=" --listen-client-urls http://$SERVICE_HOST:$ETCD_PORT"
5859

5960
local unitfile="$SYSTEMD_DIR/$ETCD_SYSTEMD_SERVICE"
6061
write_user_unit_file $ETCD_SYSTEMD_SERVICE "$cmd" "" "root"

0 commit comments

Comments
 (0)