fog-libvirt 0.4.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1be3f7614833884bc18f6c8cc31784d9d831e8f2
-  data.tar.gz: 7e6fc8812af255b7e640ce5fc02f1a3f6a1fc4d3
+SHA256:
+  metadata.gz: f3f3d3db14311de4008b43186334103d78f393b03f30282fc6276c1c5f3a7bd3
+  data.tar.gz: acdeffc9be9ca8fa2d2fe5065616b9c7a14c4415b03359437500cfd7c47f63f0
 SHA512:
-  metadata.gz: 73a49e73d10ba49159cb92bf950e6bb76deac2b60d9bf537beefe21314a1ce4e53015347f5f421060f791cbeae121da5dbffa602979ae9f2d077b69aa321de1d
-  data.tar.gz: 17decadd48d88dc4b61845ec6fdb5b946e9b78a23fbe68cc1998d44f210218af9416002daf3628c7d39fdc7c141965d5e73a5e7231088a8c776c04b55fd7cdd6
+  metadata.gz: e0cb8dbd4c13fd8aa4540e8da830d5853b4507c87795edb3aeb03f644d68d895405e7ed804795b70cf0921fb3a54586f6c912ee67eb52abb4e8e7ee07212bfa6
+  data.tar.gz: 8e0f16895181fc4becbf81a3a08d215b39be6d77414425fd2238b696b313c9fd9931f23ce38af538f109d403e50aa4430fa674266050c3698f703331762cdec5

data/fog-libvirt.gemspec

@@ -23,25 +23,16 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md]
 
-  s.add_dependency("fog-core", "~> 1.27", ">= 1.27.4")
+  s.required_ruby_version = '>= 2.0.0'
+
+  s.add_dependency("fog-core", ">= 1.27.4")
   s.add_dependency("fog-json")
   s.add_dependency("fog-xml", "~> 0.1.1")
   s.add_dependency('ruby-libvirt','>= 0.7.0')
-  s.add_dependency('mime-types','< 2.0') if RUBY_VERSION < '1.9'
-  s.add_dependency('nokogiri', '< 1.6') if RUBY_VERSION < '1.9'
-  s.add_dependency('octokit', '< 3.0') if RUBY_VERSION < '1.9'
-  s.add_dependency('rest-client', '<= 1.7.0') if RUBY_VERSION < '1.9'
-  s.add_dependency("tins", "<= 1.6.0") if RUBY_VERSION < "1.9"
-
-  # Fedora and derivates need explicit require.
-  # Also we cannot use newer JSON on Ruby 1.8 & 1.9.
-  if RUBY_VERSION < '2.0'
-    s.add_dependency("json", '< 2.0')
-  else
-    s.add_dependency("json")
-  end
-
-  s.add_development_dependency("minitest")
+  s.add_dependency("json")
+
+  s.add_development_dependency("net-ssh")
+  s.add_development_dependency("minitest", "~> 5.0")
   s.add_development_dependency("minitest-stub-const")
   s.add_development_dependency("pry")
   s.add_development_dependency("rake")

data/lib/fog/bin/libvirt.rb

@@ -1,9 +1,9 @@
-module Libvirt # deviates from other bin stuff to accomodate gem
+module Libvirt # deviates from other bin stuff to accommodate gem
   class << self
     def class_for(key)
       case key
       when :compute
-        Fog::Compute::Libvirt
+        Fog::Libvirt::Compute
       else
         raise ArgumentError, "Unrecognized service: #{key}"
       end

data/lib/fog/libvirt.rb

@@ -9,9 +9,7 @@ module Fog
   module Libvirt
     extend Fog::Provider
 
-    module Compute
-      autoload :Libvirt, File.expand_path('../libvirt/compute', __FILE__)
-    end
+    autoload :Compute, File.expand_path('../libvirt/compute', __FILE__)
 
     service(:compute, 'Compute')
   end

data/lib/fog/libvirt/compute.rb

@@ -2,8 +2,8 @@ require 'fog/libvirt/models/compute/util/util'
 require 'fog/libvirt/models/compute/util/uri'
 
 module Fog
-  module Compute
-    class Libvirt < Fog::Service
+  module Libvirt
+    class Compute < Fog::Service
       requires   :libvirt_uri
       recognizes :libvirt_username, :libvirt_password
       recognizes :libvirt_ip_command
@@ -44,10 +44,12 @@ module Fog
       request :list_interfaces
       request :destroy_interface
       request :get_node_info
+      request :update_autostart
       request :update_display
+      request :libversion
 
       module Shared
-        include Fog::Compute::LibvirtUtil
+        include Fog::Libvirt::Util
       end
 
       class Mock
@@ -77,7 +79,7 @@ module Fog
         attr_reader :ip_command
 
         def initialize(options={})
-          @uri = ::Fog::Compute::LibvirtUtil::URI.new(enhance_uri(options[:libvirt_uri]))
+          @uri = ::Fog::Libvirt::Util::URI.new(enhance_uri(options[:libvirt_uri]))
           @ip_command = options[:libvirt_ip_command]
 
           # libvirt is part of the gem => ruby-libvirt

data/lib/fog/libvirt/models/compute/README.md

@@ -26,6 +26,22 @@ Only ssh is supported as the transport for remote URI's. TLS is NOT supported, a
 - To check the connection you need to override your libvirt socket location in the URI
   - "qemu+ssh://patrick@myserver/system?socket=/var/run/libvirt/libvirt-sock"
 
+## Ceph RBD volumes
+To configure Ceph RBD volumes, the file ``/etc/foreman/ceph.conf`` is used.
+After adding the authentication key to a libvirt secret, it can be configured as follows:
+```
+monitor=mon001.example.com,mon002.example.com,mon003.example.com
+port=6789
+libvirt_ceph_pool=rbd_pool_name
+auth_username=libvirt
+auth_uuid=uuid_of_libvirt_secret
+bus_type=virtio
+```
+For more recent versions of libvirt which support using the secret by name (`usage` attribute in the `secret` tag),
+you can also drop `auth_uuid` and specify `auth_usage` instead. If both are specified, `auth_uuid` will be preferred for maximum compatibility.
+
+The `bus_type` can be set to `virtio` or `scsi`. If it is ommited, the default is `scsi`.
+
 ## Configuration
 
 The URI can be configured in two ways:

data/lib/fog/libvirt/models/compute/interface.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Interface < Fog::Model
         identity :name
         attribute :mac

data/lib/fog/libvirt/models/compute/interfaces.rb

@@ -2,10 +2,10 @@ require 'fog/core/collection'
 require 'fog/libvirt/models/compute/interface'
 
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Interfaces < Fog::Collection
-        model Fog::Compute::Libvirt::Interface
+        model Fog::Libvirt::Compute::Interface
 
         def all(filter={})
           load(service.list_interfaces(filter))

data/lib/fog/libvirt/models/compute/network.rb

@@ -2,10 +2,10 @@ require 'fog/core/model'
 require 'fog/libvirt/models/compute/util/util'
 
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Network < Fog::Model
-        include Fog::Compute::LibvirtUtil
+        include Fog::Libvirt::Util
 
         identity :uuid
         attribute :name

data/lib/fog/libvirt/models/compute/networks.rb

@@ -2,10 +2,10 @@ require 'fog/core/collection'
 require 'fog/libvirt/models/compute/network'
 
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Networks < Fog::Collection
-        model Fog::Compute::Libvirt::Network
+        model Fog::Libvirt::Compute::Network
 
         def all(filter={})
           load(service.list_networks(filter))

data/lib/fog/libvirt/models/compute/nic.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Nic < Fog::Model
         identity :mac
         attribute :id

data/lib/fog/libvirt/models/compute/nics.rb

@@ -2,10 +2,10 @@ require 'fog/core/collection'
 require 'fog/libvirt/models/compute/nic'
 
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Nics < Fog::Collection
-        model Fog::Compute::Libvirt::Nic
+        model Fog::Libvirt::Compute::Nic
       end
     end
   end

data/lib/fog/libvirt/models/compute/node.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Node < Fog::Model
         identity :uuid
 

data/lib/fog/libvirt/models/compute/nodes.rb

@@ -2,10 +2,10 @@ require 'fog/core/collection'
 require 'fog/libvirt/models/compute/node'
 
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Nodes < Fog::Collection
-        model Fog::Compute::Libvirt::Node
+        model Fog::Libvirt::Compute::Node
 
         def all(filter={ })
           load(service.get_node_info)

data/lib/fog/libvirt/models/compute/pool.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Pool < Fog::Model
         attr_reader :xml
 

data/lib/fog/libvirt/models/compute/pools.rb

@@ -2,10 +2,10 @@ require 'fog/core/collection'
 require 'fog/libvirt/models/compute/pool'
 
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Pools < Fog::Collection
-        model Fog::Compute::Libvirt::Pool
+        model Fog::Libvirt::Compute::Pool
 
         def all(filter = {})
           load(service.list_pools(filter))

data/lib/fog/libvirt/models/compute/server.rb

@@ -3,10 +3,10 @@ require 'fog/libvirt/models/compute/util/util'
 require 'fileutils'
 
 module Fog
-  module Compute
-    class Libvirt
+  module Libvirt
+    class Compute
       class Server < Fog::Compute::Server
-        include Fog::Compute::LibvirtUtil
+        include Fog::Libvirt::Util
         attr_reader :xml
 
         identity :id, :aliases => 'uuid'
@@ -28,6 +28,9 @@ module Fog
         attribute :boot_order
         attribute :display
         attribute :cpu
+        attribute :hugepages
+        attribute :guest_agent
+        attribute :virtio_rng
 
         attribute :state
 
@@ -75,6 +78,10 @@ module Fog
           action_status
         end
 
+        def update_autostart(value)
+          service.update_autostart(uuid, value)
+        end
+
         def mac
           nics.first.mac if nics && nics.first
         end
@@ -129,9 +136,10 @@ module Fog
         end
 
         #alias methods
-        alias_method :halt,    :poweroff
-        alias_method :stop,    :shutdown
-        alias_method :active?, :active
+        alias_method :halt,       :poweroff
+        alias_method :stop,       :shutdown
+        alias_method :active?,    :active
+        alias_method :autostart?, :autostart
 
         def volumes
           # lazy loading of volumes
@@ -258,11 +266,139 @@ module Fog
         private
         attr_accessor :volumes_path
 
-        # This retrieves the ip address of the mac address
+        # This tests the library version before redefining the address
+        # method for this instance to use a method compatible with
+        # earlier libvirt libraries, or uses the dhcp method from more
+        # recent releases.
+        def addresses(service_arg=service, options={})
+          addresses_method = self.method(:addresses_dhcp)
+          # check if ruby-libvirt was compiled against a new enough version
+          # that can use dhcp_leases, as otherwise it will not provide the
+          # method dhcp_leases on any of the network objects.
+          has_dhcp_leases = true
+          begin
+            service.networks.first.dhcp_leases(self.mac)
+          rescue NoMethodError
+            has_dhcp_leases = false
+          rescue
+            # assume some other odd exception.
+          end
+
+          # if ruby-libvirt not compiled with support, or remote library is
+          # too old (must be newer than 1.2.8), then use old fallback
+          if not has_dhcp_leases or service.libversion() < 1002008
+            addresses_method = self.method(:addresses_ip_command)
+          end
+
+          # replace current definition for this instance with correct one for
+          # detected libvirt to perform check once for connection
+          (class << self; self; end).class_eval do
+            define_method(:addresses, addresses_method)
+          end
+          addresses(service_arg, options)
+        end
+
+        def ssh_ip_command(ip_command, uri)
+          # Retrieve the parts we need from the service to setup our ssh options
+          user=uri.user #could be nil
+          host=uri.host
+          keyfile=uri.keyfile
+          port=uri.port
+
+          # Setup the options
+          ssh_options={}
+          ssh_options[:keys]=[ keyfile ] unless keyfile.nil?
+          ssh_options[:port]=port unless keyfile.nil?
+          ssh_options[:paranoid]=true if uri.no_verify?
+
+          begin
+            result=Fog::SSH.new(host, user, ssh_options).run(ip_command)
+          rescue Errno::ECONNREFUSED
+            raise Fog::Errors::Error.new("Connection was refused to host #{host} to retrieve the ip_address for #{mac}")
+          rescue Net::SSH::AuthenticationFailed
+            raise Fog::Errors::Error.new("Error authenticating over ssh to host #{host} and user #{user}")
+          end
+
+          # Check for a clean exit code
+          if result.first.status == 0
+            return result.first.stdout.strip
+          else
+            # We got a failure executing the command
+            raise Fog::Errors::Error.new("The command #{ip_command} failed to execute with a clean exit code")
+          end
+        end
+
+        def local_ip_command(ip_command)
+          # Execute the ip_command locally
+          # Initialize empty ip_address string
+          ip_address=""
+
+          IO.popen("#{ip_command}") do |p|
+            p.each_line do |l|
+              ip_address+=l
+            end
+            status=Process.waitpid2(p.pid)[1].exitstatus
+            if status!=0
+              raise Fog::Errors::Error.new("The command #{ip_command} failed to execute with a clean exit code")
+            end
+          end
+
+          #Strip any new lines from the string
+          ip_address.chomp
+        end
+
+        # This retrieves the ip address of the mac address using ip_command
         # It returns an array of public and private ip addresses
         # Currently only one ip address is returned, but in the future this could be multiple
         # if the server has multiple network interface
-        def addresses(service_arg=service, options={})
+        def addresses_ip_command(service_arg=service, options={})
+          mac=self.mac
+
+          # Aug 24 17:34:41 juno arpwatch: new station 10.247.4.137 52:54:00:88:5a:0a eth0.4
+          # Aug 24 17:37:19 juno arpwatch: changed ethernet address 10.247.4.137 52:54:00:27:33:00 (52:54:00:88:5a:0a) eth0.4
+          # Check if another ip_command string was provided
+          ip_command_global=service_arg.ip_command.nil? ? 'grep $mac /var/log/arpwatch.log|sed -e "s/new station//"|sed -e "s/changed ethernet address//g" |sed -e "s/reused old ethernet //" |tail -1 |cut -d ":" -f 4-| cut -d " " -f 3' : service_arg.ip_command
+          ip_command_local=options[:ip_command].nil? ? ip_command_global : options[:ip_command]
+
+          ip_command="mac=#{mac}; server_name=#{name}; "+ip_command_local
+
+          ip_address=nil
+
+          if service_arg.uri.ssh_enabled?
+            ip_address=ssh_ip_command(ip_command, service_arg.uri)
+          else
+            # It's not ssh enabled, so we assume it is
+            if service_arg.uri.transport=="tls"
+              raise Fog::Errors::Error.new("TlS remote transport is not currently supported, only ssh")
+            end
+            ip_address=local_ip_command(ip_command)
+          end
+
+          # The Ip-address command has been run either local or remote now
+
+          if ip_address==""
+            #The grep didn't find an ip address result"
+            ip_address=nil
+          else
+            # To be sure that the command didn't return another random string
+            # We check if the result is an actual ip-address
+            # otherwise we return nil
+            unless ip_address=~/^(\d{1,3}\.){3}\d{1,3}$/
+              raise Fog::Errors::Error.new(
+                        "The result of #{ip_command} does not have valid ip-address format\n"+
+                            "Result was: #{ip_address}\n"
+                    )
+            end
+          end
+
+          return { :public => [ip_address], :private => [ip_address]}
+        end
+
+        # This retrieves the ip address of the mac address using dhcp_leases
+        # It returns an array of public and private ip addresses
+        # Currently only one ip address is returned, but in the future this could be multiple
+        # if the server has multiple network interface
+        def addresses_dhcp(service_arg=service, options={})
           mac=self.mac
 
           ip_address = nil
@@ -343,13 +479,17 @@ module Fog
             :os_type                => "hvm",
             :arch                   => "x86_64",
             :domain_type            => "kvm",
+            :autostart              => false,
             :iso_dir                => default_iso_dir,
             :network_interface_type => "network",
             :network_nat_network    => "default",
             :network_bridge_name    => "br0",
             :boot_order             => %w[hd cdrom network],
             :display                => default_display,
-            :cpu                    => {}
+            :cpu                    => {},
+            :hugepages              => false,
+            :guest_agent            => true,
+            :virtio_rng             => {},
           }
         end