github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4636 from jameskyle/feature/vagrant-up-fix-4633

Browse Source 
Resolves #4633.
This commit is contained in:
Victor Marmol 2015-02-20 13:46:34 -08:00
commit 2575c45a85
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Vagrantfile vendored
View File

@ -69,12 +69,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
end
# Kubernetes master
config.vm.define "master" do |config|
customize_vm config
config.vm.provision "shell", run: "always", path: "#{ENV['KUBE_TEMP']}/master-start.sh"
config.vm.network "private_network", ip: "#{$master_ip}"
config.vm.hostname = ENV['MASTER_NAME']
config.vm.define "master" do |c|
customize_vm c
if ENV['KUBE_TEMP'] then
script = "#{ENV['KUBE_TEMP']}/master-start.sh"
c.vm.provision "shell", run: "always", path: script
end
c.vm.network "private_network", ip: "#{$master_ip}"
c.vm.hostname = ENV['MASTER_NAME']
end
# Kubernetes minion
@ -84,10 +86,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
minion_index = n+1
minion_ip = $minion_ips[n]
minion.vm.provision "shell", run: "always", path: "#{ENV['KUBE_TEMP']}/minion-start-#{n}.sh"
if ENV['KUBE_TEMP'] then
script = "#{ENV['KUBE_TEMP']}/minion-start-#{n}.sh"
minion.vm.provision "shell", run: "always", path: script
end
minion.vm.network "private_network", ip: "#{minion_ip}"
minion.vm.hostname = "#{ENV['INSTANCE_PREFIX']}-minion-#{minion_index}"
end
end
end