Merge "Make Vagrant libvirt graphics_ip configurable"

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

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: {