From 83d83ebb47789daca83d07583fbd2514061caf84 Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Mon, 14 Nov 2016 12:17:34 +0100 Subject: [PATCH 1/2] Fix ports in migration script --- cluster/images/etcd/migrate-if-needed.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/images/etcd/migrate-if-needed.sh b/cluster/images/etcd/migrate-if-needed.sh index 23752ccaa4a..5b94a2148df 100755 --- a/cluster/images/etcd/migrate-if-needed.sh +++ b/cluster/images/etcd/migrate-if-needed.sh @@ -101,12 +101,12 @@ fi start_etcd() { # Use random ports, so that apiserver cannot connect to etcd. ETCD_PORT=18629 - ETCD_PEER_PORT=18630 + ETCD_PEER_PORT=2380 # Avoid collisions between etcd and event-etcd. case "${DATA_DIRECTORY}" in *event*) ETCD_PORT=18631 - ETCD_PEER_PORT=18632 + ETCD_PEER_PORT=2381 ;; esac local ETCD_CMD="${ETCD:-/usr/local/bin/etcd-${START_VERSION}}" From 2bccbafb6d8be2fb7302287849dcf98f1198823d Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Tue, 15 Nov 2016 10:27:02 +0100 Subject: [PATCH 2/2] Set --name flag in etcd migration script --- cluster/images/etcd/migrate-if-needed.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cluster/images/etcd/migrate-if-needed.sh b/cluster/images/etcd/migrate-if-needed.sh index 5b94a2148df..12a7a5ec6fe 100755 --- a/cluster/images/etcd/migrate-if-needed.sh +++ b/cluster/images/etcd/migrate-if-needed.sh @@ -117,7 +117,8 @@ start_etcd() { else ETCDCTL_CMD="${ETCDCTL_CMD} --endpoints=http://127.0.0.1:${ETCD_PORT} put" fi - ${ETCD_CMD} --data-dir=${DATA_DIRECTORY} \ + ${ETCD_CMD} --name="etcd-$(hostname)" \ + --data-dir=${DATA_DIRECTORY} \ --listen-client-urls http://127.0.0.1:${ETCD_PORT} \ --advertise-client-urls http://127.0.0.1:${ETCD_PORT} \ --listen-peer-urls http://127.0.0.1:${ETCD_PEER_PORT} \