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

8
dev/vagrant/Vagrantfile vendored
View File

@ -166,10 +166,10 @@ 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|
if PROVIDER == "libvirt"
vm.graphics_ip = GRAPHICSIP
end
end
admin.hostmanager.aliases = "operator"
end
@ -186,10 +186,10 @@ 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|
if PROVIDER == "libvirt"
vm.graphics_ip = GRAPHICSIP
end
end
node.hostmanager.aliases = hostname
end
end