diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-03 15:27:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-03 15:27:23 +0000 |
| commit | 50130834bff726252a72e646d94d3b9148eb5021 (patch) | |
| tree | 61b81eeda6989b58a8e860718e15a64cc3969ab5 /dev | |
| parent | 5bbd578379876c236581dd3ada8619095e750c91 (diff) | |
| parent | f043d6ea7be2f1668bf09951ece11072d840c776 (diff) | |
| download | kolla-50130834bff726252a72e646d94d3b9148eb5021.tar.gz kolla-50130834bff726252a72e646d94d3b9148eb5021.zip | |
Merge "Simplify logic of vagrantfile"
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/vagrant/Vagrantfile | 12 |
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 |