From 0c2d7268e9f304d48c49076a2c465ef11f35a9e7 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Mon, 2 Nov 2015 14:56:01 +0000
Subject: [PATCH] fix the etcd configuration for the stock Debian package

---
 vagrant-test/Vagrantfile  | 12 ------------
 vagrant-test/bootstrap.sh | 10 ++++++++++
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/vagrant-test/Vagrantfile b/vagrant-test/Vagrantfile
index 1498c94..897bd21 100644
--- a/vagrant-test/Vagrantfile
+++ b/vagrant-test/Vagrantfile
@@ -23,15 +23,6 @@ cat >/etc/hosts <<EOF
 EOF
 SCRIPT
 
-# Static configuration for etcd.
-$setup_etcd = <<SCRIPT
-cat >/etc/default/etcd <<EOF
-START=1
-ETCD_INITIAL_CLUSTER_STATE=new
-ETCD_INITIAL_CLUSTER=node1=http://192.168.50.2:2380,node2=http://192.168.50.3:2380,node3=http://192.168.50.4:2380
-EOF
-SCRIPT
-
 # Setup apt proxy.
 $setup_apt_proxy = <<SCRIPT
 cat >/etc/apt/apt.conf.d/000apt-proxy <<EOF
@@ -58,19 +49,16 @@ Vagrant.configure(API_VERSION) do |config|
   config.vm.define "node1" do |m|
     m.vm.hostname = "node1"
     m.vm.network "private_network", ip: "192.168.50.2"
-    m.vm.provision "shell", inline: $setup_etcd
   end
 
   config.vm.define "node2" do |m|
     m.vm.hostname = "node2"
     m.vm.network "private_network", ip: "192.168.50.3"
-    m.vm.provision "shell", inline: $setup_etcd
   end
 
   config.vm.define "node3" do |m|
     m.vm.hostname = "node3"
     m.vm.network "private_network", ip: "192.168.50.4"
-    m.vm.provision "shell", inline: $setup_etcd
 
     # Create a test mountpoint.
     m.vm.provision "shell",
diff --git a/vagrant-test/bootstrap.sh b/vagrant-test/bootstrap.sh
index 25206a5..ee42ef8 100644
--- a/vagrant-test/bootstrap.sh
+++ b/vagrant-test/bootstrap.sh
@@ -35,6 +35,16 @@ GROUPID=icecast
 ENABLE=true
 EOF
 
+cat >/etc/default/etcd <<EOF
+ETCD_LISTEN_PEER_URLS=http://0.0.0.0:2380
+ETCD_INITIAL_ADVERTISE_PEER_URLS=http://$(hostname -s):2380
+ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379
+ETCD_ADVERTISE_CLIENT_URLS=http://$(hostname -s):2379
+ETCD_INITIAL_CLUSTER_STATE=new
+#ETCD_INITIAL_CLUSTER=node1=http://192.168.50.2:2380,node2=http://192.168.50.3:2380,node3=http://192.168.50.4:2380
+ETCD_INITIAL_CLUSTER=node1=http://node1:2380,node2=http://node2:2380,node3=http://node3:2380
+EOF
+
 # Install the required packages.
 export DEBIAN_FRONTEND=noninteractive
 apt-get -qq update
-- 
GitLab