openstack/devstack
Code Issues Proposed changes

Merge "Make etcd3 setup work with IPv6 addresses"

Browse Source
This commit is contained in:
Jenkins 2017-09-28 05:28:36 +00:00 committed by Gerrit Code Review
commit b0a08c1b04
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/etcd3
View File

@ -40,9 +40,13 @@ function start_etcd3 {
cmd+=" --initial-cluster-state new --initial-cluster-token etcd-cluster-01" cmd+=" --initial-cluster-state new --initial-cluster-token etcd-cluster-01"
cmd+=" --initial-cluster $HOSTNAME=http://$SERVICE_HOST:2380" cmd+=" --initial-cluster $HOSTNAME=http://$SERVICE_HOST:2380"
cmd+=" --initial-advertise-peer-urls http://$SERVICE_HOST:2380" cmd+=" --initial-advertise-peer-urls http://$SERVICE_HOST:2380"
cmd+=" --advertise-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 " cmd+=" --listen-peer-urls http://0.0.0.0:2380 "
cmd+=" --listen-client-urls http://${HOST_IP}:$ETCD_PORT" fi
cmd+=" --listen-client-urls http://$SERVICE_HOST:$ETCD_PORT"
local unitfile="$SYSTEMD_DIR/$ETCD_SYSTEMD_SERVICE" local unitfile="$SYSTEMD_DIR/$ETCD_SYSTEMD_SERVICE"
write_user_unit_file $ETCD_SYSTEMD_SERVICE "$cmd" "" "root" write_user_unit_file $ETCD_SYSTEMD_SERVICE "$cmd" "" "root"