vagrant-libvirt 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51177f85551c960b41b4ff1a07c5d26a5c0c9e04
-  data.tar.gz: 0aa138d06f5c151c96a05b891efe0a1ea6cf95cd
+  metadata.gz: 163bfaa2d6099827892e25c54b696ae99be739a4
+  data.tar.gz: fa6669dc8ad9ffbfa81bd36d04ed07b886a77964
 SHA512:
-  metadata.gz: 6efc95bb91d5ffdee56802775ab3b485c3c7ee70578b31f254a394b6adbbeaa46e6ea644260c9edd9d64d734e8c6dc2db88bb689482b3dddf3389568d30c13c9
-  data.tar.gz: a7afeebe910244f5e92058040baa3baeb4167c9058ac5b40de30d17d823b80aaa2370f0456474c8adab65cd82588b99e2280ccef65e7ac163c592435ae5b1b11
+  metadata.gz: 5c9c79db505309da293ae7919bf843ef4650b620a45cffa1a3dd81952d13569b7a2d2dbcc77d771fdc5d50fdf557364316518254c905b276cc5f098faa66c0d6
+  data.tar.gz: 8db3d0bea7fc78083c403b78ff1b7b20bb22cefdd90ef31ce3fe4757082e16c2a144a237b4fa13a563ff804ce5f85192084252baa1278aa461b4a41b3df14cac

data/README.md

@@ -152,8 +152,9 @@ end
 * `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_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".
+* `graphics_passwd` - Sets the password for the display protocol. Working for vnc and spice. by default working without passsword.
 * `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.
 

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

@@ -8,7 +8,7 @@ module VagrantPlugins
         include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
 
         def initialize(app, env)
-          @logger = Log4r::Logger.new("vagrant_libvirt::action::create_domain")
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::create_domain')
           @app = app
         end
 
@@ -39,6 +39,11 @@ module VagrantPlugins
           @graphics_autoport = config.graphics_autoport
           @graphics_port = config.graphics_port
           @graphics_ip = config.graphics_ip
+          @graphics_passwd =  if config.graphics_passwd.to_s.empty?
+                                ''
+                              else
+                                "passwd='#{config.graphics_passwd.to_s}'"
+                              end
           @video_type = config.video_type
           @video_vram = config.video_vram
 
@@ -54,7 +59,7 @@ module VagrantPlugins
           # Get path to domain image.
           domain_volume = ProviderLibvirt::Util::Collection.find_matching(
             env[:libvirt_compute].volumes.all, "#{@name}.img")
-          raise Errors::DomainVolumeExists if domain_volume == nil
+          raise Errors::DomainVolumeExists if domain_volume.nil?
           @domain_volume_path = domain_volume.path
 
           # the default storage prefix is typically: /var/lib/libvirt/images/
@@ -84,22 +89,23 @@ module VagrantPlugins
           end
 
           # Output the settings we're going to use to the user
-          env[:ui].info(I18n.t("vagrant_libvirt.creating_domain"))
-          env[:ui].info(" -- Name:          #{@name}")
-          env[:ui].info(" -- Domain type:   #{@domain_type}")
-          env[:ui].info(" -- Cpus:          #{@cpus}")
-          env[:ui].info(" -- Memory:        #{@memory_size/1024}M")
-          env[:ui].info(" -- Base box:      #{env[:machine].box.name}")
-          env[:ui].info(" -- Storage pool:  #{@storage_pool_name}")
-          env[:ui].info(" -- Image:         #{@domain_volume_path}")
-          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}")
+          env[:ui].info(I18n.t('vagrant_libvirt.creating_domain'))
+          env[:ui].info(" -- Name:              #{@name}")
+          env[:ui].info(" -- Domain type:       #{@domain_type}")
+          env[:ui].info(" -- Cpus:              #{@cpus}")
+          env[:ui].info(" -- Memory:            #{@memory_size/1024}M")
+          env[:ui].info(" -- Base box:          #{env[:machine].box.name}")
+          env[:ui].info(" -- Storage pool:      #{@storage_pool_name}")
+          env[:ui].info(" -- Image:             #{@domain_volume_path}")
+          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(" -- Graphics Password: #{@graphics_passwd.empty? ? 'Not defined': 'Defined'}")
+          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)}")

data/lib/vagrant-libvirt/config.rb

@@ -23,7 +23,7 @@ module VagrantPlugins
       attr_accessor :host
 
       # If use ssh tunnel to connect to Libvirt.
-      attr_accessor :connect_via_ssh 
+      attr_accessor :connect_via_ssh
       # Path towards the libvirt socket
       attr_accessor :socket
 
@@ -65,6 +65,7 @@ module VagrantPlugins
       attr_accessor :graphics_type
       attr_accessor :graphics_autoport
       attr_accessor :graphics_port
+      attr_accessor :graphics_passwd
       attr_accessor :graphics_ip
       attr_accessor :video_type
       attr_accessor :video_vram
@@ -101,6 +102,7 @@ module VagrantPlugins
         @graphics_autoport = UNSET_VALUE
         @graphics_port     = UNSET_VALUE
         @graphics_ip       = UNSET_VALUE
+        @graphics_passwd   = UNSET_VALUE
         @video_type        = UNSET_VALUE
         @video_vram        = UNSET_VALUE
 
@@ -132,6 +134,8 @@ module VagrantPlugins
         }.merge(options)
 
         #puts "storage(#{storage_type} --- #{options.to_s})"
+        require 'pry'
+        binding.pry
         @disks = [] if @disks == UNSET_VALUE
 
         disk = {
@@ -205,7 +209,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
+        @management_network_mode = 'nat' if @management_network_mode == UNSET_VALUE
 
         # generate a URI if none is supplied
         @uri = _generate_uri() if @uri == UNSET_VALUE
@@ -224,6 +228,10 @@ module VagrantPlugins
         @graphics_type = 'vnc' if @graphics_type == UNSET_VALUE
         @graphics_autoport = 'yes' if @graphics_port == UNSET_VALUE
         @graphics_autoport = 'no' if @graphics_port != UNSET_VALUE
+        if (@graphics_type != 'vnc' && @graphics_port != 'spice') ||
+            @graphics_passwd == UNSET_VALUE
+          @graphics_passwd = nil
+        end
         @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

data/lib/vagrant-libvirt/plugin.rb

@@ -31,9 +31,9 @@ module VagrantPlugins
         require_relative 'provider'
         Provider
       end
-      
-      guest_capability("linux", "mount_p9_shared_folder") do
-        require_relative "cap/mount_p9"
+
+      guest_capability('linux', 'mount_p9_shared_folder') do
+        require_relative 'cap/mount_p9'
         Cap::MountP9
       end
 

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

@@ -51,9 +51,11 @@
       <target port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
-    <graphics type='<%= @graphics_type %>' port='<%= @graphics_port %>' autoport='<%= @graphics_autoport %>' listen='<%= @graphics_ip %>' keymap='en-us'/>
-    <video>
-        <model type='<%= @video_type %>' vram='<%= @video_vram %>' heads='1'/>
-    </video>
+    <%# Video device -%>
+    <graphics type='<%= @graphics_type %>' port='<%= @graphics_port %>' autoport='<%= @graphics_autoport %>' listen='<%= @graphics_ip %>' keymap='en-us' <%= @graphics_passwd%> />
+      <video>
+          <model type='<%= @video_type %>' vram='<%= @video_vram %>' heads='1'/>
+      </video>
+    <%#End Video -%>
   </devices>
 </domain>

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

@@ -4,9 +4,9 @@
 
   <% if @network_forward_mode != 'none' %>
     <% if @network_forward_device %>
-  <forward mode="<%= @network_forward_mode %>" dev="<%= @network_forward_device %>" />
+      <forward mode="<%= @network_forward_mode %>" dev="<%= @network_forward_device %>" />
     <% else %>
-  <forward mode="<%= @network_forward_mode %>" />
+      <forward mode="<%= @network_forward_mode %>" />
     <% end %>
   <% end %>
 

data/lib/vagrant-libvirt/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core