...
|
...
|
@@ -142,12 +142,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
142
|
142
|
fixup_net_udev = '-f'
|
143
|
143
|
end
|
144
|
144
|
network_plugin = vagrant_openshift_config['network_plugin']
|
|
145
|
+ if network_plugin != ''
|
|
146
|
+ network_plugin = "-n #{network_plugin}"
|
|
147
|
+ end
|
145
|
148
|
|
146
|
149
|
# OpenShift master
|
147
|
150
|
config.vm.define "#{VM_NAME_PREFIX}master" do |config|
|
148
|
151
|
config.vm.box = kube_box[kube_os]["name"]
|
149
|
152
|
config.vm.box_url = kube_box[kube_os]["box_url"]
|
150
|
|
- config.vm.provision "shell", inline: "/bin/bash -x /vagrant/contrib/vagrant/provision-master.sh #{master_ip} #{num_minion} #{minion_ips_str} #{instance_prefix} -n '#{network_plugin}' #{fixup_net_udev}"
|
|
153
|
+ config.vm.provision "shell", inline: "/bin/bash -x /vagrant/contrib/vagrant/provision-master.sh #{master_ip} #{num_minion} #{minion_ips_str} #{instance_prefix} #{network_plugin} #{fixup_net_udev}"
|
151
|
154
|
config.vm.network "private_network", ip: "#{master_ip}"
|
152
|
155
|
config.vm.hostname = "openshift-master"
|
153
|
156
|
config.vm.synced_folder ".", "/vagrant", type: vagrant_openshift_config['sync_folders_type']
|
...
|
...
|
@@ -160,7 +163,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
160
|
160
|
minion_ip = minion_ips[n]
|
161
|
161
|
minion.vm.box = kube_box[kube_os]["name"]
|
162
|
162
|
minion.vm.box_url = kube_box[kube_os]["box_url"]
|
163
|
|
- minion.vm.provision "shell", inline: "/bin/bash -x /vagrant/contrib/vagrant/provision-node.sh #{master_ip} #{num_minion} #{minion_ips_str} #{instance_prefix} -n '#{network_plugin}' -i #{minion_index} #{fixup_net_udev}"
|
|
163
|
+ minion.vm.provision "shell", inline: "/bin/bash -x /vagrant/contrib/vagrant/provision-node.sh #{master_ip} #{num_minion} #{minion_ips_str} #{instance_prefix} -i #{minion_index} #{network_plugin} #{fixup_net_udev}"
|
164
|
164
|
minion.vm.network "private_network", ip: "#{minion_ip}"
|
165
|
165
|
minion.vm.hostname = "openshift-minion-#{minion_index}"
|
166
|
166
|
config.vm.synced_folder ".", "/vagrant", type: vagrant_openshift_config['sync_folders_type']
|