vagrant-libvirt 0.0.30 → 0.0.31

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

@@ -1,7 +1,7 @@
     <filesystem type='mount' accessmode='<%= accessmode %>'>
       <driver type='path' wrpolicy='immediate'/>
       <source dir='<%= hostpath %>'/>
-      <target dir='<%= target %>'/>
+      <target dir='<%= mount_tag %>'/>
       <% unless readonly.nil? %>
          <readonly /> 
       <% end %>

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

@@ -0,0 +1,11 @@
+<interface type='<%= @type %>'>
+  <% if @mac %>
+  <mac address='<%= @mac %>'/>
+  <% end %>
+  <source address='<%=@tunnel_ip%>' port='<%= @tunnel_port %>'>
+  <% if @type == 'udp' %>
+    <local address='<%=@udp_tunnel_local_ip%>' port='<%=@udp_tunnel_local_port%>' />
+  <% end %>
+  </source>
+  <model type='<%=@model_type%>'/>
+</interface>

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
-          management_network_mode = env[:machine].provider_config.management_network_mode 
+          management_network_mode = env[:machine].provider_config.management_network_mode
+          management_network_mac = env[:machine].provider_config.management_network_mac
           logger.info "Using #{management_network_name} at #{management_network_address} as the management network #{management_network_mode} is the mode"
 
           begin
@@ -37,6 +38,10 @@ module VagrantPlugins
             forward_mode: management_network_mode,
           }
 
+          unless management_network_mac.nil?
+            management_network_options[:mac] = management_network_mac
+          end
+
           # add management network to list of networks to check
           networks = [ management_network_options ]
 
@@ -54,6 +59,11 @@ module VagrantPlugins
               dhcp_enabled: true,
               forward_mode: 'nat',
             }.merge(options)
+
+            if options[:type].to_s == 'dhcp' && options[:ip].nil?
+              options[:network_name] = "vagrant-private-dhcp"
+            end
+
             # add to list of networks to check
             networks.push(options)
           end

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.30'
+    VERSION = '0.0.31'
   end
 end

data/locales/en.yml

@@ -12,6 +12,9 @@ en:
       Checking if volume is available.
     creating_domain: |-
       Creating domain with the following settings...
+    manual_resize_required: |-
+      Created volume larger than box defaults, will require manual resizing of
+      filesystems to utilize.
     uploading_volume: |-
       Uploading base box image as volume into libvirt storage...
     creating_domain_volume: |-
@@ -47,8 +50,13 @@ en:
     remove_stale_volume: |-
       Remove stale volume...
 
+    warnings:
+      ignoring_virtual_size_too_small: |-
+        Ignoring requested virtual disk size of '%{requested}' as it is below
+        the minimum box image size of '%{box_virtual_size}'.
+
     errors:
-      package_not_supported: Not support package for libvirt. Create box manualy.
+      package_not_supported: No support for package with libvirt. Create box manually.
       fog_error: |-
         There was an error talking to Libvirt. The error message is shown
         below:
@@ -71,7 +79,7 @@ en:
         Interface adapter number is already in use. Please specify other adapter
         number.
       rsync_error: |-
-        There was an error when attemping to rsync a share folder.
+        There was an error when attempting to rsync a share folder.
         Please inspect the error message below for more info.
 
         Host path: %{hostpath}
@@ -115,7 +123,7 @@ en:
         Network %{network_name} exists but does not have dhcp %{requested}.
         Please fix your configuration and run vagrant again.
       create_network_error: |-
-        Error occured while creating new network: %{error_message}.
+        Error occurred while creating new network: %{error_message}.
       network_not_available_error: |-
         Network %{network_name} is not available. Specify available network
         name, or an ip address if you want to create a new network.
@@ -127,21 +135,22 @@ en:
         Error while removing network %{network_name}. %{error_message}.
       delete_snapshot_error: |-
         Error while deleting snapshot: %{error_message}.
+      tunnel_port_not_defined: |-
+         tunnel UDP or TCP port not defined.
 
     states:
-      short_paused: |-
-        pause
-      short_shutoff: |-
-        shutoff
-      long_shutoff: |-
+      paused: |-
+        The Libvirt domain is suspended. Run `vagrant resume` to resume it.
+      shutting_down: |-
+        The Libvirt domain is shutting down. Wait for it to complete and
+        then run `vagrant up` to start it or `vagrant destroy` to remove.
+      shutoff: |-
         The Libvirt domain is not running. Run `vagrant up` to start it.
-      short_not_created: |-
-        not created
-      long_not_created: |-
+      not_created: |-
         The Libvirt domain is not created. Run `vagrant up` to create it.
-
-      short_running: |-
-        running
-      long_running: |-
+      running: |-
         The Libvirt domain is running. To stop this machine, you can run
         `vagrant halt`. To destroy the machine, you can run `vagrant destroy`.
+      preparing: |-
+        The vagrant machine is being prepared for creation, please wait for
+        it to reach a steady state before issuing commands on it.

data/spec/support/environment_helper.rb

@@ -19,7 +19,7 @@ class EnvironmentHelper
     1024
   end
 
-  %w(cpus cpu_mode boot_order machine_type disk_bus nested volume_cache kernel cmd_line initrd graphics_type graphics_autoport graphics_port graphics_ip graphics_passwd video_type video_vram keymap storage_pool_name disks cdroms driver).each do |name|
+  %w(cpus cpu_mode loader boot_order machine_type disk_bus nested volume_cache kernel cmd_line initrd graphics_type graphics_autoport graphics_port graphics_ip graphics_passwd video_type video_vram keymap storage_pool_name disks cdroms driver).each do |name|
     define_method(name.to_sym) do
       nil
     end

data/tools/prepare_redhat_for_box.sh

@@ -54,8 +54,6 @@ rm -f ~root/${EPEL_PKG}
 yum -y install openssh-server openssh-clients sudo \
 ruby ruby-devel make gcc rubygems rsync
 chkconfig sshd on
-gem install puppet
-gem install chef
 
 
 # Users, groups, passwords and sudoers.
@@ -118,3 +116,4 @@ rm -f ~root/.bash_history
 rm -r "$(gem env gemdir)"/doc/*
 yum clean all
 
+halt

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -106,6 +106,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -116,7 +117,6 @@ files:
 - example_box/metadata.json
 - lib/vagrant-libvirt.rb
 - lib/vagrant-libvirt/action.rb
-- lib/vagrant-libvirt/action/connect_libvirt.rb
 - lib/vagrant-libvirt/action/create_domain.rb
 - lib/vagrant-libvirt/action/create_domain_volume.rb
 - lib/vagrant-libvirt/action/create_network_interfaces.rb
@@ -139,11 +139,10 @@ files:
 - lib/vagrant-libvirt/action/prepare_nfs_valid_ids.rb
 - lib/vagrant-libvirt/action/prune_nfs_exports.rb
 - 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/remove_stale_volume.rb
 - lib/vagrant-libvirt/action/resume_domain.rb
+- lib/vagrant-libvirt/action/set_boot_order.rb
 - lib/vagrant-libvirt/action/set_name_of_domain.rb
 - lib/vagrant-libvirt/action/share_folders.rb
 - lib/vagrant-libvirt/action/start_domain.rb
@@ -153,6 +152,7 @@ files:
 - lib/vagrant-libvirt/cap/nic_mac_addresses.rb
 - lib/vagrant-libvirt/cap/synced_folder.rb
 - lib/vagrant-libvirt/config.rb
+- lib/vagrant-libvirt/driver.rb
 - lib/vagrant-libvirt/errors.rb
 - lib/vagrant-libvirt/plugin.rb
 - lib/vagrant-libvirt/provider.rb
@@ -162,6 +162,7 @@ files:
 - lib/vagrant-libvirt/templates/interface.xml.erb
 - lib/vagrant-libvirt/templates/private_network.xml.erb
 - lib/vagrant-libvirt/templates/public_interface.xml.erb
+- lib/vagrant-libvirt/templates/tunnel_interface.xml.erb
 - lib/vagrant-libvirt/templates/volume_snapshot.xml.erb
 - lib/vagrant-libvirt/util.rb
 - lib/vagrant-libvirt/util/collection.rb

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

@@ -1,51 +0,0 @@
-require 'fog/libvirt'
-require 'log4r'
-
-module VagrantPlugins
-  module ProviderLibvirt
-    module Action
-      class ConnectLibvirt
-        def initialize(app, env)
-          @logger = Log4r::Logger.new('vagrant_libvirt::action::connect_libvirt')
-          @app = app
-        end
-
-        def call(env)
-          # If already connected to libvirt, just use it and don't connect
-          # again.
-          if ProviderLibvirt.libvirt_connection
-            env[:libvirt_compute] = ProviderLibvirt.libvirt_connection
-            return @app.call(env)
-          end
-
-          # Get config options for libvirt provider.
-          config = env[:machine].provider_config
-          uri = config.uri
-
-          conn_attr = {}
-          conn_attr[:provider] = 'libvirt'
-          conn_attr[:libvirt_uri] = uri
-          conn_attr[:libvirt_username] = config.username if config.username
-          conn_attr[:libvirt_password] = config.password if config.password
-
-          # Setup command for retrieving IP address for newly created machine
-          # with some MAC address. Get it from dnsmasq leases table
-          ip_command = %q[ awk "/$mac/ {print \$1}" /proc/net/arp ]
-          conn_attr[:libvirt_ip_command] = ip_command
-
-          @logger.info("Connecting to Libvirt (#{uri}) ...")
-          begin
-            env[:libvirt_compute] = Fog::Compute.new(conn_attr)
-          rescue Fog::Errors::Error => e
-            raise Errors::FogLibvirtConnectionError,
-              :error_message => e.message
-          end
-          ProviderLibvirt.libvirt_connection = env[:libvirt_compute]
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
-

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

@@ -1,68 +0,0 @@
-require "log4r"
-
-module VagrantPlugins
-  module ProviderLibvirt
-    module Action
-      # This action reads the SSH info for the machine and puts it into the
-      # `:machine_ssh_info` key in the environment.
-      class ReadSSHInfo
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_libvirt::action::read_ssh_info")
-        end
-
-        def call(env)
-          env[:machine_ssh_info] = read_ssh_info(env[:libvirt_compute],
-                                                 env[:machine])
-
-          @app.call(env)
-        end
-
-        def read_ssh_info(libvirt, machine)
-          return nil if machine.id.nil?
-          return nil if machine.state.id != :running
-
-          # Find the machine
-          domain = libvirt.servers.get(machine.id)
-          if domain.nil?
-            # The machine can't be found
-            @logger.info("Machine couldn't be found, assuming it got destroyed.")
-            machine.id = nil
-            return nil
-          end
-
-          # Get IP address from dnsmasq lease file.
-          ip_address = nil
-          begin
-            domain.wait_for(2) do
-              addresses.each_pair do |type, ip|
-                # 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
-            end
-          rescue Fog::Errors::TimeoutError
-            @logger.info("Timeout at waiting for an ip address for machine %s" % machine.name)
-          end
-
-          if not ip_address
-            @logger.info("No lease found for machine %s" % machine.name)
-            return nil
-          end
-
-          ssh_info = {
-            :host          => ip_address,
-            :port          => machine.config.ssh.guest_port,
-            :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}' -i '#{machine.provider_config.id_ssh_key_file}' nc %h %p" if machine.provider_config.connect_via_ssh
-
-          ssh_info
-        end
-      end
-    end
-  end
-end

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

@@ -1,60 +0,0 @@
-require 'log4r'
-
-module VagrantPlugins
-  module ProviderLibvirt
-    module Action
-      # This action reads the state of the machine and puts it in the
-      # `:machine_state_id` key in the environment.
-      class ReadState
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new('vagrant_libvirt::action::read_state')
-        end
-
-        def call(env)
-          env[:machine_state_id] = read_state(env[:libvirt_compute], env[:machine])
-          @app.call(env)
-        end
-
-        def read_state(libvirt, machine)
-          return :not_created if machine.id.nil?
-
-          begin
-            server = libvirt.servers.get(machine.id)
-          rescue Libvirt::RetrieveError => e
-            server = nil
-            @logger.debug('Machine not found #{e}.')
-          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? || server.state.to_sym == :terminated
-              # The machine can't be found
-              @logger.info('Machine terminated, assuming it got destroyed.')
-              machine.id = nil
-              return :not_created
-            end
-          rescue Libvirt::RetrieveError => e
-            if e.libvirt_code == ProviderLibvirt::Util::ErrorCodes::VIR_ERR_NO_DOMAIN
-              @logger.info("Machine #{machine.id} not found.")
-              machine.id = nil
-              return :not_created
-            else
-              raise e
-            end
-          end
-
-          # Return the state
-          return server.state.to_sym
-        end
-      end
-    end
-  end
-end