vagrant-libvirt 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fdf8fd6ca4373ada92ce1485825e511b1fdd31c
-  data.tar.gz: ec35f9ff56aedd836339cde2f3a1d6e387ef03d3
+  metadata.gz: 51177f85551c960b41b4ff1a07c5d26a5c0c9e04
+  data.tar.gz: 0aa138d06f5c151c96a05b891efe0a1ea6cf95cd
 SHA512:
-  metadata.gz: db2d803e5384f118a5380c18536ebd190a397aacdb4e3cacbd09365100210b681737bdbd7a4be8ac085d724f10777a42963bd5023e0b57919e4e43ca47780eea
-  data.tar.gz: a5243fd03b92a76e0a921ed93a061bd5b0161568a60905f074d5c37a5f6a8706db98d94d0273b91162817c1cf98ec609f5d3ec331605891b67a98f64c089763d
+  metadata.gz: 6efc95bb91d5ffdee56802775ab3b485c3c7ee70578b31f254a394b6adbbeaa46e6ea644260c9edd9d64d734e8c6dc2db88bb689482b3dddf3389568d30c13c9
+  data.tar.gz: a7afeebe910244f5e92058040baa3baeb4167c9058ac5b40de30d17d823b80aaa2370f0456474c8adab65cd82588b99e2280ccef65e7ac163c592435ae5b1b11

data/README.md

@@ -151,6 +151,11 @@ end
 * `initrd` - To specify the initramfs/initrd to use for the guest. Equivalent to qemu `-initrd`.
 * `random_hostname` - To create a domain name with extra information on the end to prevent hostname conflicts.
 * `cmd_line` - Arguments passed on to the guest kernel initramfs or initrd to use. Equivalent to qemu `-append`.
+* `graphics_type` - Sets the protocol used to expose the guest display.  Defaults to `vnc`.  Possible values are "sdl", "curses", "none", "gtk", or "vnc".
+* `graphics_port` - Sets the port for the display protocol to bind to.  Defaults to 5900. 
+* `graphics_ip` - Sets the IP for the display protocol to bind to.  Defaults to "127.0.0.0.1".
+* `video_type` - Sets the graphics card type exposed to the guest.  Defaults to "cirrus".  Possible values are "cirrus", "std", "vmware", "qxl", "tcx", "cg3", or "none".
+* `video_vram` - Used by some graphics card types to vary the amount of RAM dedicated to video.  Defaults to 9216.
 
 
 Specific domain settings can be set for each domain separately in multi-VM
@@ -289,21 +294,7 @@ end
 
 ## SSH Access To VM
 
-There are some configuration options for ssh access to VM via `config.ssh.*` in
-Vagrantfile. Untill provider version 0.0.5, root user was hardcoded and used to
-access VMs ssh. Now, vagrant user is used by default, but it's configurable via
-`config.ssh.username` option in Vagrantfile now.
-
-If you are still using CentOS 6.4 box from example in this README, please set
-ssh username back to root, because user vagrant is not usable (I forgot to add
-necessary ssh key to his authorized_keys).
-
-Configurable ssh parameters in Vagrantfile after provider version 0.0.5 are:
-
-* `config.ssh.username` - Default is username vagrant.
-* `config.ssh.guest_port` - Default port is set to 22.
-* `config.ssh.forward_agent` - Default is false.
-* `config.ssh.forward_x11` - Default is false.
+vagrant-libvirt supports vagrant's [standard ssh settings](https://docs.vagrantup.com/v2/vagrantfile/ssh_settings.html).
 
 ## Forwarded Ports
 
@@ -329,6 +320,23 @@ it an setting the type, e.g.
 
     config.vm.synced_folder './', '/vagrant', type: 'rsync'
 
+## Customized Graphics
+
+vagrant-libvirt supports customizing the display and video settings of the
+managed guest.  This is probably most useful for VNC-type displays with multiple
+guests.  It lets you specify the exact port for each guest to use deterministically.
+
+Here is an example of using custom display options:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider :libvirt do |libvirt|
+    libvirt.graphics_port = 5901
+    libvirt.graphics_ip = '0.0.0.0'
+    libvirt.video_type = 'qxl'
+  end
+end
+```
 
 ## Box Format
 

data/lib/vagrant-libvirt/action.rb

@@ -74,6 +74,8 @@ module VagrantPlugins
 
               # VM is not running or suspended.
 
+              b3.use Provision
+
               # Ensure networks are created and active
               b3.use CreateNetworks
 

data/lib/vagrant-libvirt/action/create_domain.rb

@@ -35,6 +35,12 @@ module VagrantPlugins
           @kernel = config.kernel
           @cmd_line = config.cmd_line
           @initrd = config.initrd
+          @graphics_type = config.graphics_type
+          @graphics_autoport = config.graphics_autoport
+          @graphics_port = config.graphics_port
+          @graphics_ip = config.graphics_ip
+          @video_type = config.video_type
+          @video_vram = config.video_vram
 
           # Storage
           @storage_pool_name = config.storage_pool_name
@@ -89,6 +95,12 @@ module VagrantPlugins
           env[:ui].info(" -- Volume Cache:  #{@domain_volume_cache}")
           env[:ui].info(" -- Kernel:        #{@kernel}")
           env[:ui].info(" -- Initrd:        #{@initrd}")
+          env[:ui].info(" -- Graphics Type: #{@graphics_type}")
+          env[:ui].info(" -- Graphics Port: #{@graphics_port}")
+          env[:ui].info(" -- Graphics IP:   #{@graphics_ip}")
+          env[:ui].info(" -- Video Type:    #{@video_type}")
+          env[:ui].info(" -- Video VRAM:    #{@video_vram}")
+
           if @disks.length > 0
             env[:ui].info(" -- Disks:         #{_disks_print(@disks)}")
           end

data/lib/vagrant-libvirt/action/read_ssh_info.rb

@@ -43,17 +43,12 @@ module VagrantPlugins
           ssh_info = {
             :host          => ip_address,
             :port          => machine.config.ssh.guest_port,
-            :username      => machine.config.ssh.username,
             :forward_agent => machine.config.ssh.forward_agent,
             :forward_x11   => machine.config.ssh.forward_x11,
           }
           
           ssh_info[:proxy_command] = "ssh '#{machine.provider_config.host}' -l '#{machine.provider_config.username}' nc %h %p" if machine.provider_config.connect_via_ssh
 
-          if not ssh_info[:username]
-            ssh_info[:username] = machine.config.ssh.default.username
-          end
-
           ssh_info
         end
       end

data/lib/vagrant-libvirt/config.rb

@@ -46,6 +46,7 @@ module VagrantPlugins
       # Libvirt default network
       attr_accessor :management_network_name
       attr_accessor :management_network_address
+      attr_accessor :management_network_mode
 
       # Default host prefix (alternative to use project folder name)
       attr_accessor :default_prefix
@@ -61,6 +62,12 @@ module VagrantPlugins
       attr_accessor :kernel
       attr_accessor :cmd_line
       attr_accessor :initrd
+      attr_accessor :graphics_type
+      attr_accessor :graphics_autoport
+      attr_accessor :graphics_port
+      attr_accessor :graphics_ip
+      attr_accessor :video_type
+      attr_accessor :video_vram
 
       # Storage
       attr_accessor :disks
@@ -77,6 +84,7 @@ module VagrantPlugins
         @random_hostname   = UNSET_VALUE
         @management_network_name    = UNSET_VALUE
         @management_network_address = UNSET_VALUE
+        @management_network_mode = UNSET_VALUE
 
         # Domain specific settings.
         @memory            = UNSET_VALUE
@@ -89,6 +97,12 @@ module VagrantPlugins
         @kernel            = UNSET_VALUE
         @initrd            = UNSET_VALUE
         @cmd_line          = UNSET_VALUE
+        @graphics_type     = UNSET_VALUE
+        @graphics_autoport = UNSET_VALUE
+        @graphics_port     = UNSET_VALUE
+        @graphics_ip       = UNSET_VALUE
+        @video_type        = UNSET_VALUE
+        @video_vram        = UNSET_VALUE
 
         # Storage
         @disks             = UNSET_VALUE
@@ -191,6 +205,7 @@ module VagrantPlugins
         @random_hostname = false if @random_hostname == UNSET_VALUE
         @management_network_name = 'vagrant-libvirt' if @management_network_name == UNSET_VALUE
         @management_network_address = '192.168.121.0/24' if @management_network_address == UNSET_VALUE
+        @management_network_mode = 'nat' if @management_network_address == UNSET_VALUE
 
         # generate a URI if none is supplied
         @uri = _generate_uri() if @uri == UNSET_VALUE
@@ -206,6 +221,13 @@ module VagrantPlugins
         @kernel = nil if @kernel == UNSET_VALUE
         @cmd_line = '' if @cmd_line == UNSET_VALUE
         @initrd = '' if @initrd == UNSET_VALUE
+        @graphics_type = 'vnc' if @graphics_type == UNSET_VALUE
+        @graphics_autoport = 'yes' if @graphics_port == UNSET_VALUE
+        @graphics_autoport = 'no' if @graphics_port != UNSET_VALUE
+        @graphics_port = 5900 if @graphics_port == UNSET_VALUE
+        @graphics_ip = '127.0.0.1' if @graphics_ip == UNSET_VALUE
+        @video_type = 'cirrus' if @video_type == UNSET_VALUE
+        @video_vram = 9216 if @video_vram == UNSET_VALUE
 
         # Storage
         @disks = [] if @disks == UNSET_VALUE

data/lib/vagrant-libvirt/templates/domain.xml.erb

@@ -5,9 +5,11 @@
 
   <% if @nested %>
     <cpu mode='<%= @cpu_mode %>'>
-      <model fallback='allow'>qemu64</model>
-      <feature policy='optional' name='vmx'/>
-      <feature policy='optional' name='svm'/>
+      <% if @cpu_mode != 'host-passthrough' %>
+        <model fallback='allow'>qemu64</model>
+        <feature policy='optional' name='vmx'/>
+        <feature policy='optional' name='svm'/>
+      <% end %>
     </cpu>
   <% end %>
 
@@ -49,9 +51,9 @@
       <target port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='5900' autoport='yes' listen='127.0.0.1' keymap='en-us'/>
+    <graphics type='<%= @graphics_type %>' port='<%= @graphics_port %>' autoport='<%= @graphics_autoport %>' listen='<%= @graphics_ip %>' keymap='en-us'/>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+        <model type='<%= @video_type %>' vram='<%= @video_vram %>' heads='1'/>
     </video>
   </devices>
 </domain>

data/lib/vagrant-libvirt/util/network_util.rb

@@ -10,7 +10,8 @@ module VagrantPlugins
         def configured_networks(env, logger)
           management_network_name = env[:machine].provider_config.management_network_name
           management_network_address = env[:machine].provider_config.management_network_address
-          logger.info "Using #{management_network_name} at #{management_network_address} as the management network"
+          management_network_mode = env[:machine].provider_config.management_network_mode 
+          logger.info "Using #{management_network_name} at #{management_network_address} as the management network #{management_network_mode} is the mode"
 
           begin
             management_network_ip = IPAddr.new(management_network_address)
@@ -33,7 +34,7 @@ module VagrantPlugins
             ip: $1,
             netmask: $2,
             dhcp_enabled: true,
-            forward_mode: 'nat',
+            forward_mode: management_network_mode,
           }
 
           # add management network to list of networks to check

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.21'
+    VERSION = '0.0.22'
   end
 end

data/vagrant-libvirt.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'fog', '1.15'
   gem.add_runtime_dependency 'ruby-libvirt', '0.4.0'
-  gem.add_runtime_dependency 'nokogiri', '1.6'
+  gem.add_runtime_dependency 'nokogiri', '~> 1.6.0'
 
   gem.add_development_dependency 'rake', '10.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -86,16 +86,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement