openstack/kolla-ansible
Code Issues Proposed changes

Merge "Simplify logic of vagrantfile"

Browse Source
This commit is contained in:
Jenkins 2016-03-03 15:27:22 +00:00 committed by Gerrit Code Review
commit 50130834bf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dev/vagrant/Vagrantfile vendored
View File

@ -166,9 +166,9 @@ Vagrant.configure(2) do |config|
admin.vm.provider PROVIDER do |vm| admin.vm.provider PROVIDER do |vm|
vm.memory = MULTINODE ? get_setting(:operator, :memory) : get_setting(:aio, :memory) vm.memory = MULTINODE ? get_setting(:operator, :memory) : get_setting(:aio, :memory)
vm.cpus = MULTINODE ? get_setting(:operator, :cpus) : get_setting(:aio, :cpus) vm.cpus = MULTINODE ? get_setting(:operator, :cpus) : get_setting(:aio, :cpus)
end if PROVIDER == "libvirt"
admin.vm.provider "libvirt" do |vm| vm.graphics_ip = GRAPHICSIP
vm.graphics_ip = GRAPHICSIP end
end end
admin.hostmanager.aliases = "operator" admin.hostmanager.aliases = "operator"
end end
@ -186,9 +186,9 @@ Vagrant.configure(2) do |config|
node.vm.provider PROVIDER do |vm| node.vm.provider PROVIDER do |vm|
vm.memory = get_setting(node_type.to_sym, :memory) vm.memory = get_setting(node_type.to_sym, :memory)
vm.cpus = get_setting(node_type.to_sym, :cpus) vm.cpus = get_setting(node_type.to_sym, :cpus)
end if PROVIDER == "libvirt"
node.vm.provider "libvirt" do |vm| vm.graphics_ip = GRAPHICSIP
vm.graphics_ip = GRAPHICSIP end
end end
node.hostmanager.aliases = hostname node.hostmanager.aliases = hostname
end end