diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-03 04:41:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-03 04:41:35 +0000 |
| commit | 0f5c22c169f27993099fef05a0e07d54e549fc61 (patch) | |
| tree | 73559422d313fa9fe00db9f79b86559f67b2df8c | |
| parent | 75ce1e447d37c9b232d8ebb1703dc03c2d0fd7c4 (diff) | |
| parent | 558b900e83ca13e2af38a37e347fe63f557c9b6c (diff) | |
| download | kolla-0f5c22c169f27993099fef05a0e07d54e549fc61.tar.gz kolla-0f5c22c169f27993099fef05a0e07d54e549fc61.zip | |
Merge "Make Vagrant libvirt graphics_ip configurable"
| -rw-r--r-- | dev/vagrant/Vagrantfile | 10 | ||||
| -rw-r--r-- | dev/vagrant/Vagrantfile.custom.example | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/dev/vagrant/Vagrantfile b/dev/vagrant/Vagrantfile index 35d738594..9e4e0d34d 100644 --- a/dev/vagrant/Vagrantfile +++ b/dev/vagrant/Vagrantfile @@ -19,6 +19,10 @@ PROVIDER ||= "libvirt" # Either centos or ubuntu DISTRO ||= "centos" +# The libvirt graphics_ip used for each guest. Only applies if PROVIDER +# is libvirt. +GRAPHICSIP ||= "127.0.0.1" + PROVIDER_DEFAULTS ||= { libvirt: { centos: { @@ -163,6 +167,9 @@ Vagrant.configure(2) do |config| 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 + end admin.hostmanager.aliases = "operator" end @@ -180,6 +187,9 @@ Vagrant.configure(2) do |config| 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 + end node.hostmanager.aliases = hostname end end diff --git a/dev/vagrant/Vagrantfile.custom.example b/dev/vagrant/Vagrantfile.custom.example index f56310fce..bb82f041a 100644 --- a/dev/vagrant/Vagrantfile.custom.example +++ b/dev/vagrant/Vagrantfile.custom.example @@ -12,6 +12,10 @@ # Either centos or ubuntu # DISTRO = "centos" +# The libvirt graphics_ip used for each guest. Only applies if PROVIDER +# is libvirt. +# GRAPHICSIP = "127.0.0.1" + # PROVIDER_DEFAULTS = { # libvirt: { # centos: { |