From 9ae62c93dd601d9a41b8c1b0e114f27f2b2d8860 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Mon, 12 Oct 2015 13:54:58 -0700 Subject: [PATCH] Updated Vagrant with the latest UX Signed-off-by: Madhu Venugopal --- libnetwork/{docs => }/Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename libnetwork/{docs => }/Vagrantfile (85%) diff --git a/libnetwork/docs/Vagrantfile b/libnetwork/Vagrantfile similarity index 85% rename from libnetwork/docs/Vagrantfile rename to libnetwork/Vagrantfile index 55d665f195..42827b4b26 100644 --- a/libnetwork/docs/Vagrantfile +++ b/libnetwork/Vagrantfile @@ -19,7 +19,7 @@ apt-get -y install wget curl apt-get -y install bridge-utils wget -qO- https://experimental.docker.com/ | sh gpasswd -a vagrant docker -echo DOCKER_OPTS=\\"--default-network=overlay:multihost --kv-store=consul:192.168.33.10:8500 --label=com.docker.network.driver.overlay.bind_interface=eth1 --label=com.docker.network.driver.overlay.neighbor_ip=192.168.33.11\\" >> /etc/default/docker +echo DOCKER_OPTS=\\"--cluster-store=consul://192.168.33.10:8500 --cluster-advertise=${1}:0\\" >> /etc/default/docker cp /vagrant/vagrant-systemd/docker.service /etc/systemd/system/ systemctl daemon-reload systemctl restart docker.service @@ -51,7 +51,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| vb.customize ["modifyvm", :id, "--memory", "1024"] end net.vm.network :private_network, ip: "#{net_ip}" - net.vm.provision :shell, inline: $bootstrap + net.vm.provision :shell, inline: $bootstrap, :args => "#{net_ip}" end end