aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2016-03-03 17:31:53 +0900
committerMartin André <m.andre@redhat.com>2016-03-03 17:31:53 +0900
commitf043d6ea7be2f1668bf09951ece11072d840c776 (patch)
tree4dba2e4e687df909a338a2ee6195efa74b4109c9
parent0f5c22c169f27993099fef05a0e07d54e549fc61 (diff)
downloadkolla-f043d6ea7be2f1668bf09951ece11072d840c776.tar.gz
kolla-f043d6ea7be2f1668bf09951ece11072d840c776.zip
Simplify logic of vagrantfile
TrivialFix Change-Id: I0af5d5a80f28d8cb8b5f0e7799fd87bcd73e09cf
-rw-r--r--dev/vagrant/Vagrantfile12
1 files changed, 6 insertions, 6 deletions
diff --git a/dev/vagrant/Vagrantfile b/dev/vagrant/Vagrantfile
index 9e4e0d34d..3c1400337 100644
--- a/dev/vagrant/Vagrantfile
+++ b/dev/vagrant/Vagrantfile
@@ -166,9 +166,9 @@ Vagrant.configure(2) do |config|
admin.vm.provider PROVIDER do |vm|
vm.memory = MULTINODE ? get_setting(:operator, :memory) : get_setting(:aio, :memory)
vm.cpus = MULTINODE ? get_setting(:operator, :cpus) : get_setting(:aio, :cpus)
- end
- admin.vm.provider "libvirt" do |vm|
- vm.graphics_ip = GRAPHICSIP
+ if PROVIDER == "libvirt"
+ vm.graphics_ip = GRAPHICSIP
+ end
end
admin.hostmanager.aliases = "operator"
end
@@ -186,9 +186,9 @@ Vagrant.configure(2) do |config|
node.vm.provider PROVIDER do |vm|
vm.memory = get_setting(node_type.to_sym, :memory)
vm.cpus = get_setting(node_type.to_sym, :cpus)
- end
- node.vm.provider "libvirt" do |vm|
- vm.graphics_ip = GRAPHICSIP
+ if PROVIDER == "libvirt"
+ vm.graphics_ip = GRAPHICSIP
+ end
end
node.hostmanager.aliases = hostname
end