vagrant-libvirt 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c21fb27cb9d1d69b36af2d3b057639381ad6e2c
-  data.tar.gz: c02977b68b33bab4a2786634e9ba9f3f53ed256a
+  metadata.gz: c633bc158ce861be39e58bc78d855adacc3b4b81
+  data.tar.gz: 85417be2e4286096a08c3b64a79c1e23619cfa3e
 SHA512:
-  metadata.gz: 8a41f855485a0a6330d5252ce38bcb0575f2b6c05448109c9be316f884ba2b5a5fa4ea2761e9535f253ef4efc2fff8799a168f9f574825e5d46601251c23b0af
-  data.tar.gz: 4413ab7c72460e77df91097458176ba93e85f1544dd7c86f262abc792d2762cb83e5bebb5a292825b60cfd2ced501868b084116163e5d416678dbf095a2af601
+  metadata.gz: c8bdb50440ec7ad74d3cebd4dfcc0f78e41ec61c545ad59635f909f2e10b5201e77d42853e03529c9caff75b46cb56f3603c5f4421d2df172989948215c92464
+  data.tar.gz: 74b16894928781624bda71679ae7b92d403241536d67074e046c517f55813fe793d70447f8debaf7a3887e599d99d57b282d432a21a922db546de878f4f5d0d8

data/README.md

@@ -46,7 +46,7 @@ missing development libraries for libxslt, libxml2 and libvirt.
 
 In Ubuntu, Debian, ...
 ```
-$ sudo apt-get install libxslt-dev libxml2-dev libvirt-dev
+$ sudo apt-get install libxslt-dev libxml2-dev libvirt-dev zlib1g-dev
 ```
 
 In RedHat, Centos, Fedora, ...
@@ -64,6 +64,8 @@ a `config.vm.provider` block. So first, add Libvirt box using any name you
 want. This is just an example of Libvirt CentOS 6.4 box available:
 
 ```
+vagrant box add centos64 http://citozin.com/fedora21.box
+# or
 vagrant box add centos64 http://citozin.com/centos64.box
 ```
 
@@ -121,7 +123,7 @@ Although it should work without any configuration for most people, this provider
 * `connect_via_ssh` - If use ssh tunnel to connect to Libvirt.
 * `username` - Username and password to access Libvirt.
 * `password` - Password to access Libvirt.
-* `id_ssh_key_file` - If not nil, uses this ssh private key to access Libvirt. Default is $HOME/.ssh/id_rsa. Prepends $HOME/.ssh/ if no directory.  
+* `id_ssh_key_file` - If not nil, uses this ssh private key to access Libvirt. Default is $HOME/.ssh/id_rsa. Prepends $HOME/.ssh/ if no directory.
 * `socket` - Path to the libvirt unix socket (eg: /var/run/libvirt/libvirt-sock)
 * `uri` - For advanced usage. Directly specifies what libvirt connection URI vagrant-libvirt should use. Overrides all other connection configuration options.
 
@@ -152,7 +154,7 @@ 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_type` - Sets the protocol used to expose the guest display.  Defaults to `vnc`.  Possible values are "sdl", "curses", "none", "gtk", "vnc" or "spice".
 * `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.
@@ -238,8 +240,18 @@ starts with 'libvirt__' string. Here is a list of those options:
   network 'default' is used.
 * `:libvirt__netmask` - Used only together with `:ip` option. Default is
   '255.255.255.0'.
+* `:libvirt__host_ip` - Adress to use for the host (not guest).
+  Default is first possible address (after network address).
 * `:libvirt__dhcp_enabled` - If DHCP will offer addresses, or not. Used only
   when creating new network. Default is true.
+* `:libvirt__dhcp_start` - First address given out via DHCP.
+  Default is third address in range (after network name and gateway).
+* `:libvirt__dhcp_stop` - Last address given out via DHCP.
+  Default is last possible address in range (before broadcast address).
+* `:libvirt__dhcp_bootp_file` - The file to be used for the boot image.
+  Used only when dhcp is enabled.
+* `:libvirt__dhcp_bootp_server` - The server that runs the DHCP server.
+  Used only when dhcp is enabled.By default is the same host that runs the DHCP server.
 * `:libvirt__adapter` - Number specifiyng sequence number of interface.
 * `:libvirt__forward_mode` - Specify one of `veryisolated`, `none`, `nat` or `route` options.
   This option is used only when creating new network. Mode `none` will create
@@ -298,6 +310,7 @@ You can create and attach additional disks to a VM via `libvirt.storage :file`.
 * `type` - Type of disk image to create. Defaults to *qcow2*.
 * `bus` - Type of bus to connect device to. Defaults to *virtio*.
 * `cache` - Cache mode to use, e.g. `none`, `writeback`, `writethrough` (see the [libvirt documentation for possible values](http://libvirt.org/formatdomain.html#elementsDisks) or [here](https://www.suse.com/documentation/sles11/book_kvm/data/sect1_chapter_book_kvm.html) for a fuller explanation). Defaults to *default*.
+* `allow_existing` - Set to true if you want to allow the VM to use a pre-existing disk.  This is useful for sharing disks between VMs, e.g. in order to simulate shared SAN storage. Shared disks removed only manualy.If not exists - will created. If exists - using existed.
 
 The following example creates two additional disks.
 
@@ -385,12 +398,13 @@ The box is a tarball containing:
 * `Vagrantfile` that does default settings for the provider-specific configuration for this provider.
 
 ## Create Box
-This script creates a vagrant-libvirt box from a qcow2 file:
+To create a vagrant-libvirt box from a qcow2 image, run `create_box.sh` (located in the tools directory):
 
-Usage:
+```$ create_box.sh ubuntu14.qcow2```
 
-```create_box.sh ubuntu14.qcow2```
-Used Packer to create the qcow2 images, templates available at https://github.com/jakobadam/packer-qemu-templates
+You can also create a box by using [Packer](https://packer.io). Packer templates for use with vagrant-libvirt are available at https://github.com/jakobadam/packer-qemu-templates. After cloning that project you can build a vagrant-libvirt box by running:
+
+``` ~/packer-qemu-templates/ubuntu$ packer build ubuntu-14.04-server-amd64-vagrant.json```
 
 ## Development
 

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

@@ -84,19 +84,23 @@ module VagrantPlugins
 
             disk[:absolute_path] = storage_prefix + disk[:path]
 
-            # make the disk. equivalent to:
-            # qemu-img create -f qcow2 <path> 5g
-            begin
-              domain_volume_disk = env[:libvirt_compute].volumes.create(
-                name: disk[:name],
-                format_type: disk[:type],
-                path: disk[:absolute_path],
-                capacity: disk[:size],
-                #:allocation => ?,
-                pool_name: @storage_pool_name)
-            rescue Fog::Errors::Error => e
-              raise Errors::FogDomainVolumeCreateError,
-                  error_message:  e.message
+            if env[:libvirt_compute].volumes.all.select {|x| x.name == disk[:name] }.empty?
+              # make the disk. equivalent to:
+              # qemu-img create -f qcow2 <path> 5g
+              begin
+                env[:libvirt_compute].volumes.create(
+                  name: disk[:name],
+                  format_type: disk[:type],
+                  path: disk[:absolute_path],
+                  capacity: disk[:size],
+                  #:allocation => ?,
+                  pool_name: @storage_pool_name)
+              rescue Fog::Errors::Error => e
+                raise Errors::FogDomainVolumeCreateError,
+                    error_message:  e.message
+              end
+            else
+              disk[:preexisting] = true
             end
           end
 
@@ -123,16 +127,22 @@ module VagrantPlugins
           if @disks.length > 0
             env[:ui].info(" -- Disks:         #{_disks_print(@disks)}")
           end
+
           @disks.each do |disk|
-            env[:ui].info(" -- Disk(#{disk[:device]}):     #{disk[:absolute_path]}")
+            msg = " -- Disk(#{disk[:device]}):     #{disk[:absolute_path]}"
+            msg += " (shared. Remove only manualy)" if disk[:allow_existing]
+            msg += " Not created - using existed." if disk[:preexisting]
+            env[:ui].info(msg)
           end
 
           if @cdroms.length > 0
             env[:ui].info(" -- CDROMS:            #{_cdroms_print(@cdroms)}")
           end
+
           @cdroms.each do |cdrom|
             env[:ui].info(" -- CDROM(#{cdrom[:dev]}):        #{cdrom[:path]}")
           end
+
           env[:ui].info(" -- Command line : #{@cmd_line}")
 
           # Create libvirt domain.

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

@@ -44,7 +44,8 @@ module VagrantPlugins
               # Get a list of all (active and inactive) libvirt networks. This
               # list is used throughout this class and should be easier to
               # process than libvirt API calls.
-              @available_networks = libvirt_networks(env[:libvirt_compute].client)
+              @available_networks = libvirt_networks(
+                                      env[:libvirt_compute].client)
 
               # Prepare a hash describing network for this specific interface.
               @interface_network = {
@@ -56,7 +57,7 @@ module VagrantPlugins
                 created:          false,
                 active:           false,
                 autostart:        false,
-                libvirt_network:  nil,
+                libvirt_network:  nil
               }
 
               if @options[:ip]
@@ -121,7 +122,8 @@ module VagrantPlugins
           # Set IP address of network (actually bridge). It will be used as
           # gateway address for machines connected to this network.
           net = IPAddr.new(net_address)
-          @interface_network[:ip_address] = net.to_range.begin.succ
+          # Default to first address (after network name)
+          @interface_network[:ip_address] = @options[:host_ip].nil? ? net.to_range.begin.succ : IPAddr.new(@options[:host_ip])
 
           # Is there an available network matching to configured ip
           # address?
@@ -235,16 +237,17 @@ module VagrantPlugins
             network_address << "#{@interface_network[:netmask]}"
             net = IPAddr.new(network_address)
 
-            # First is address of network, second is gateway.
-            # Start the range two
-            # addresses after network address.
+            # First is address of network, second is gateway (by default).
+            # So start the range two addresses after network address by default.
             # TODO: Detect if this IP is not set on the interface.
-            start_address = net.to_range.begin.succ.succ
+            start_address = @options[:dhcp_start] || net.to_range.begin.succ
 
-            # Stop address must not be broadcast.
-            stop_address = net.to_range.end & IPAddr.new('255.255.255.254')
+            # Default to last possible address. (Stop address must not be broadcast address.)
+            stop_address = @options[:dhcp_stop] || (net.to_range.end & IPAddr.new('255.255.255.254'))
 
             @network_dhcp_enabled = true
+            @network_dhcp_bootp_file = @options[:dhcp_bootp_file]
+            @network_dhcp_bootp_server = @options[:dhcp_bootp_server]
             @network_range_start = start_address
             @network_range_stop = stop_address
           else

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

@@ -28,7 +28,23 @@ module VagrantPlugins
           end
 
           domain = env[:libvirt_compute].servers.get(env[:machine].id.to_s)
-          domain.destroy(destroy_volumes: true)
+
+          if env[:machine].provider_config.disks.empty?
+            # if using default configuration of disks
+            domain.destroy(destroy_volumes: true)
+          else
+            domain.destroy(destroy_volumes: false)
+
+            env[:machine].provider_config.disks.each do |disk|
+              next if disk[:allow_existing] # shared disks remove only manualy or ???
+              diskname = libvirt_domain.name + "-" + disk[:device] + ".raw"
+              # diskname is uniq
+              env[:libvirt_compute].volumes.all.select{|x| x.name == diskname }.first.destroy
+            end
+
+            #remove root storage
+            env[:libvirt_compute].volumes.all.select{|x| x.name == libvirt_domain.name + ".img" }.first.destroy
+          end
 
           @app.call(env)
         end

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

@@ -123,11 +123,7 @@ module VagrantPlugins
               :error_message => e.message
           end
 
-          if progress == image_size
-            return true
-          else
-            return false
-          end
+          return progress == image_size
         end
 
       end

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

@@ -34,7 +34,9 @@ module VagrantPlugins
           ip_address = nil
           domain.wait_for(2) {
             addresses.each_pair do |type, ip|
-              ip_address = ip[0] if ip[0] != nil
+              # Multiple leases are separated with a newline, return only
+              # the most recent address
+              ip_address = ip[0].split("\n").first if ip[0] != nil
             end
             ip_address != nil
           }

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

@@ -27,10 +27,17 @@ module VagrantPlugins
           end
           # Find the machine
           begin
+            # Wait for libvirt to shutdown the domain
+            while libvirt.servers.get(machine.id).state.to_sym == :'shutting-down' do
+              @logger.info('Waiting on the machine to shut down...')
+              sleep 1
+            end
+
             server = libvirt.servers.get(machine.id)
-            if server.nil? || [:'shutting-down', :terminated].include?(server.state.to_sym)
+
+            if server.nil? || server.state.to_sym == :terminated
               # The machine can't be found
-              @logger.info('Machine shutting down or terminated, assuming it got destroyed.')
+              @logger.info('Machine terminated, assuming it got destroyed.')
               machine.id = nil
               return :not_created
             end

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

@@ -0,0 +1,20 @@
+require 'log4r'
+
+module VagrantPlugins
+  module ProviderLibvirt
+    module Action
+      class RemoveLibvirtImage
+        def initialize(app, env)
+          @logger = Log4r::Logger.new("vagrant_libvirt::action::remove_libvirt_image")
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info("Vagrant-libvirt plugin removed box only from you LOCAL ~/.vagrant/boxes directory")
+          env[:ui].info("From libvirt storage pool you have to delete image manualy(virsh, virt-manager or by any other tool)")
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -43,7 +43,7 @@ module VagrantPlugins
         # @return [String] libvirt domain name
         def build_domain_name(env)
           config = env[:machine].provider_config
-          domain_name = 
+          domain_name =
             if config.default_prefix.nil?
               env[:root_path].basename.to_s.dup
             else

data/lib/vagrant-libvirt/action.rb

@@ -8,6 +8,13 @@ module VagrantPlugins
       include Vagrant::Action::Builtin
       @logger = Log4r::Logger.new('vagrant_libvirt::action')
 
+      # remove image from libvirt storage pool
+      def self.remove_libvirt_image
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use RemoveLibvirtImage
+        end
+      end
+
       # This action is called to bring the box up from nothing.
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
@@ -27,7 +34,6 @@ module VagrantPlugins
               b2.use CreateNetworks
               b2.use CreateNetworkInterfaces
 
-
               b2.use PrepareNFSValidIds
               b2.use SyncedFolderCleanup
               b2.use SyncedFolders
@@ -38,9 +44,6 @@ module VagrantPlugins
               b2.use StartDomain
               b2.use WaitTillUp
 
-
-
-
               b2.use ForwardPorts
 
               b2.use PrepareNFSSettings
@@ -83,7 +86,6 @@ module VagrantPlugins
               b3.use SyncedFolderCleanup
               b3.use SyncedFolders
 
-
               # Start it..
               b3.use StartDomain
 
@@ -91,11 +93,9 @@ module VagrantPlugins
               # so wait for dhcp lease and store IP into machines data_dir.
               b3.use WaitTillUp
 
-
               b3.use ForwardPorts
               b3.use PrepareNFSSettings
               b3.use ShareFolders
-
             end
           end
         end
@@ -331,6 +331,7 @@ module VagrantPlugins
       autoload :HaltDomain, action_root.join('halt_domain')
       autoload :HandleBoxImage, action_root.join('handle_box_image')
       autoload :HandleStoragePool, action_root.join('handle_storage_pool')
+      autoload :RemoveLibvirtImage, action_root.join('remove_libvirt_image')
       autoload :IsCreated, action_root.join('is_created')
       autoload :IsRunning, action_root.join('is_running')
       autoload :IsSuspended, action_root.join('is_suspended')

data/lib/vagrant-libvirt/config.rb

@@ -200,6 +200,7 @@ module VagrantPlugins
           :path => options[:path],
           :bus => options[:bus],
           :cache => options[:cache] || 'default',
+          :allow_existing => options[:allow_existing],
         }
 
         @disks << disk	# append
@@ -286,7 +287,7 @@ 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') ||
+        if (@graphics_type != 'vnc' && @graphics_type != 'spice') ||
             @graphics_passwd == UNSET_VALUE
           @graphics_passwd = nil
         end

data/lib/vagrant-libvirt/plugin.rb

@@ -32,6 +32,11 @@ module VagrantPlugins
         Provider
       end
 
+      action_hook(:remove_libvirt_image) do |hook|
+        hook.after Vagrant::Action::Builtin::BoxRemove, Action.remove_libvirt_image
+      end
+
+
       guest_capability('linux', 'mount_p9_shared_folder') do
         require_relative 'cap/mount_p9'
         Cap::MountP9
@@ -88,4 +93,3 @@ module VagrantPlugins
     end
   end
 end
-

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

@@ -15,6 +15,13 @@
     <% if @network_dhcp_enabled  %>
       <dhcp>
         <range start="<%= @network_range_start %>" end="<%= @network_range_stop %>" />
+        <% if @network_dhcp_bootp_file  %>
+          <% if @network_dhcp_bootp_server  %>
+            <bootp file="<%= @network_dhcp_bootp_file %>" server="<%= @network_dhcp_bootp_server %>" />
+          <% else %>
+            <bootp file="<%= @network_dhcp_bootp_file %>" />
+          <% end %>
+        <% end %>
       </dhcp>
     <% end %>
     </ip>

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.26'
+    VERSION = '0.0.27'
   end
 end

data/tools/create_box.sh

@@ -3,7 +3,7 @@
 
 error() {
     local msg="${1}"
-    echo "==> ${msg}"
+    echo "==> ERROR: ${msg}"
     exit 1
 }
 
@@ -70,6 +70,10 @@ if [[ -n $(backing "$IMG") ]]; then
     cp "$IMG" "$TMP_IMG"
     rebase "$TMP_IMG"
 else
+    if fuser -s "$IMG"; then
+        error "Image '$IMG_BASENAME' is used by another process"
+    fi
+
     # move the image to get a speed-up and use less space on disk
     trap 'mv "$TMP_IMG" "$IMG"; rm -rf "$TMP_DIR"' EXIT
     mv "$IMG" "$TMP_IMG"

data/vagrant-libvirt.gemspec

@@ -20,10 +20,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec-expectations", "~> 2.12.1"
   gem.add_development_dependency "rspec-mocks", "~> 2.12.1"
 
-  gem.add_runtime_dependency 'fog', '~> 1.15'
-  gem.add_runtime_dependency 'ruby-libvirt', '~> 0.4'
+  gem.add_runtime_dependency 'fog-libvirt', '~> 0.0.1'
   gem.add_runtime_dependency 'nokogiri', '~> 1.6.0'
 
   gem.add_development_dependency 'rake'
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -55,33 +55,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.12.1
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-libvirt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
-- !ruby/object:Gem::Dependency
-  name: ruby-libvirt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +140,7 @@ files:
 - lib/vagrant-libvirt/action/read_mac_addresses.rb
 - lib/vagrant-libvirt/action/read_ssh_info.rb
 - lib/vagrant-libvirt/action/read_state.rb
+- lib/vagrant-libvirt/action/remove_libvirt_image.rb
 - lib/vagrant-libvirt/action/resume_domain.rb
 - lib/vagrant-libvirt/action/set_name_of_domain.rb
 - lib/vagrant-libvirt/action/share_folders.rb