vagrant-libvirt 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dfc179b111aedecd88900df94faec1f9d949c88
-  data.tar.gz: e829ca23a1935b411bbdeddc78b57229c13c6014
+  metadata.gz: 83974c73aa002ac05b8add5ba4b4e3adff53c729
+  data.tar.gz: 00d6184e958b478752de82b38150b98d5328eafd
 SHA512:
-  metadata.gz: ad2d3f5717e17e96b422d485a08bc1ffc99d8dd53ccd4f82f9a2fea88de56b939773ac033b9f031ebc2e141dd3aa80ff6dbadf2212f9dbeaff04d006ca7092a8
-  data.tar.gz: 4c27f90f010454367c90b8eb94d621ce20d300ea4c289ae42285982dfb694e50640cfe5b96789e898471938df0f18c8905ace44584bf7b08abf95073149fd94b
+  metadata.gz: 846e3a40da1e4223aaada5eed447656c339127da0b81a47a27009b338c7f9a3bde75108ea8ed2070b71c06b03ce0ca9779e6f592bd12c81da1456bc2d2e34430
+  data.tar.gz: 6f38f979224bbeed6f37fee8ffc54c6f8f2fc7d4c51a3bbd9cd2b1b416bda942d3b02f53eb776378b12621e37da566433c0751b5638769456dbf823e8a552faf

data/README.md

@@ -148,6 +148,7 @@ end
 * `volume_cache` - Controls the cache mechanism. Possible values are "default", "none", "writethrough", "writeback", "directsync" and "unsafe". [See driver->cache in libvirt documentation](http://libvirt.org/formatdomain.html#elementsDisks).
 * `kernel` - To launch the guest with a kernel residing on host filesystems. Equivalent to qemu `-kernel`.
 * `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`.
 
 

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

@@ -81,6 +81,7 @@ module VagrantPlugins
             message = "Creating network interface eth#{@iface_number}"
             message << " connected to network #{@network_name}."
             if @mac
+              @mac = @mac.scan(/(\h{2})/).join(':')
               message << " Using MAC address: #{@mac}"
             end
             @logger.info(message)
@@ -105,6 +106,7 @@ module VagrantPlugins
             # It's used for provisioning and it has to be available during provisioning,
             # ifdown command is not acceptable here.
             next if slot_number == 0
+            next if options[:auto_config] === false
             @logger.debug "Configuring interface slot_number #{slot_number} options #{options}"
 
             network = {

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

@@ -97,6 +97,8 @@ module VagrantPlugins
               "IdentityFile=#{pk}"
             end).map { |s| s.prepend('-o ') }.join(' ')
 
+          options += " -o ProxyCommand=\"#{ssh_info[:proxy_command]}\"" if machine.provider_config.connect_via_ssh
+
           # TODO: instead of this, try and lock and get the stdin from spawn...
           ssh_cmd = ''
           if host_port <= 1024

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

@@ -35,13 +35,13 @@ module VagrantPlugins
         end
 
         # build domain name
-        # avoids `domain about to create is already taken`
+        # random_hostname option avoids
+        # `domain about to create is already taken`
         # parsable and sortable by epoch time
         # @example
         #   development-centos-6-chef-11_1404488971_3b7a569e2fd7c554b852
         # @return [String] libvirt domain name
         def build_domain_name(env)
-          postfix = "#{Time.now.utc.to_i}_#{SecureRandom.hex(10)}"
           config = env[:machine].provider_config
           domain_name = 
             if config.default_prefix.nil?
@@ -49,8 +49,11 @@ module VagrantPlugins
             else
               config.default_prefix.to_s
             end
+          domain_name << '_'
+          domain_name << env[:machine].name.to_s
           domain_name.gsub!(/[^-a-z0-9_]/i, '')
-          domain_name << "_#{postfix}"           
+          domain_name << "_#{Time.now.utc.to_i}_#{SecureRandom.hex(10)}" if config.random_hostname
+          domain_name
         end
 
       end
@@ -58,4 +61,3 @@ module VagrantPlugins
     end
   end
 end
-

data/lib/vagrant-libvirt/config.rb

@@ -40,6 +40,9 @@ module VagrantPlugins
       # be stored.
       attr_accessor :storage_pool_name
 
+      # Turn on to prevent hostname conflicts
+      attr_accessor :random_hostname
+
       # Libvirt default network
       attr_accessor :management_network_name
       attr_accessor :management_network_address
@@ -70,6 +73,7 @@ module VagrantPlugins
         @password          = UNSET_VALUE
         @id_ssh_key_file   = UNSET_VALUE
         @storage_pool_name = UNSET_VALUE
+        @random_hostname   = UNSET_VALUE
         @management_network_name    = UNSET_VALUE
         @management_network_address = UNSET_VALUE
 
@@ -182,6 +186,7 @@ module VagrantPlugins
         @password = nil if @password == UNSET_VALUE
         @id_ssh_key_file = 'id_rsa' if @id_ssh_key_file == UNSET_VALUE
         @storage_pool_name = 'default' if @storage_pool_name == UNSET_VALUE
+        @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
 

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.19'
+    VERSION = '0.0.20'
   end
 end

data/locales/en.yml

@@ -130,6 +130,8 @@ en:
         pause
       short_shutoff: |-
         shutoff
+      long_shutoff: |-
+        The Libvirt domain is not running. Run `vagrant up` to start it.
       short_not_created: |-
         not created
       long_not_created: |-

data/spec/support/environment_helper.rb

@@ -3,7 +3,9 @@ require "pathname"
 
 class EnvironmentHelper
 
-  attr_writer :default_prefix, :domain_name
+  attr_writer :domain_name
+
+  attr_accessor :random_hostname, :name, :default_prefix
 
   def [](value)
     self.send(value.to_sym)
@@ -17,10 +19,6 @@ class EnvironmentHelper
     self
   end
 
-  def default_prefix
-    # noop 
-  end
-
   def root_path
     Pathname.new("./spec/support/foo")
   end

data/spec/vagrant-libvirt/action/set_name_of_domain_spec.rb

@@ -5,10 +5,17 @@ describe VagrantPlugins::ProviderLibvirt::Action::SetNameOfDomain do
     @env = EnvironmentHelper.new
   end
 
-  it "builds uniqie domain name" do
+  it "builds unique domain name" do
+    @env.random_hostname = true
     dmn = VagrantPlugins::ProviderLibvirt::Action::SetNameOfDomain.new(Object.new, @env)
     first  = dmn.build_domain_name(@env)
     second = dmn.build_domain_name(@env)
     first.should_not eq(second) 
   end
+
+  it "builds simple domain name" do
+    @env.default_prefix= 'pre'
+    dmn = VagrantPlugins::ProviderLibvirt::Action::SetNameOfDomain.new(Object.new, @env)
+    dmn.build_domain_name(@env).should eq('pre_') 
+  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.5.9'
+  gem.add_runtime_dependency 'nokogiri', '~> 1.6'
 
   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.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.9
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement