From 7c0bfb400e52bb56e42c3d907c55e2d36f6c49aa Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Tue, 14 Oct 2014 15:01:13 +0100
Subject: [PATCH] Moves and updates cloud-config
---
Vagrantfile | 2 +-
config/user-data => cloud-config | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
rename config/user-data => cloud-config (67%)
diff --git a/Vagrantfile b/Vagrantfile
index 0efc104..d790840 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -43,7 +43,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
core.hostsupdater.aliases = ["example.dev"]
core.vm.network :private_network, ip: "#{BASE_IP_ADDR}.#{i+1}"
core.vm.synced_folder ".", "/data/infrastructure", id: "coreos-infrastructure", :nfs => true, :mount_options => ['nolock,vers=3,udp']
- core.vm.provision :file, source: "./config/user-data", destination: "/tmp/vagrantfile-user-data"
+ core.vm.provision :file, source: "./cloud-config", destination: "/tmp/vagrantfile-user-data"
core.vm.provision :shell, path: "./scripts/setup.sh"
core.vm.provision :shell, inline: "etcdctl set /services/default '{\"app\":\"nginx\", \"hostname\":\"#{HOSTNAME}\"}'"
core.vm.provision :shell, path: "./scripts/approve-user.sh", args: [HOSTNAME, "nginx"]
diff --git a/config/user-data b/cloud-config
similarity index 67%
rename from config/user-data
rename to cloud-config
index 884a035..75a4a5c 100644
--- a/config/user-data
+++ b/cloud-config
@@ -4,8 +4,8 @@ coreos:
update:
reboot-strategy: best-effort
etcd:
- addr: $public_ipv4:4001
- peer-addr: $public_ipv4:7001
+ addr: 172.17.42.1:4001
+ peer-addr: 172.17.42.1:7001
units:
- name: etcd.service
command: start
--
GitLab