ovirt_provision_plugin 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e34e8751197c85879b4acac702f27280b47023c2
-  data.tar.gz: 8ee48580f600641e1c93a61f09f8e88a6fed7c9d
+  metadata.gz: 349e41ad4b8e953c3c5c38f924b80cf21d37aef7
+  data.tar.gz: 44b74a82562056d07be2703ba5ebe466dfaa8981
 SHA512:
-  metadata.gz: 6ef825d15128bdcb0d70e8e0ea1ad86f0f72cd18ad0a4ac303d62e26f7cbc10abfebb6e686d290f76063a1985d74d8e57c086878f0c48d5771241bbd73e987a9
-  data.tar.gz: 50984c1d0ab8c1aff730d8b8e2481a41f7fc4c35a8a16237a2b36e24f0d385bfb333fc50ad5f20435f1eb5fb47ad5eebd2e0aaf4fad9576f30a4c85b621a7630
+  metadata.gz: d8093c48083014eeac5d0ea827b9dbc87d825e5647a621cc8ae7e169ae53a5d29bbaa10b2be6d36075f48ca5df3b8f2541513dda507f4f67b73591b1a681b201
+  data.tar.gz: 7fb9fe49575241a618cb070648a9e193ba39441313da9d26c1f42aa65afb3a8a684f358e43adbd11c2930c69f9c58ed5d381b44b7b05d6457b5fb05cf98f738c

data/app/models/concerns/ovirt_provision_plugin/host_extensions.rb

@@ -3,25 +3,25 @@ module OvirtProvisionPlugin
     extend ActiveSupport::Concern
 
     def ovirt_host_callback
-      logger.debug "OvirtProvisionPlugin:: Running provision callback.."
+      logger.info "OvirtProvisionPlugin:: Running provision callback.."
       max_tries = 10;
       if self.is_ovirt_node?
-        logger.debug "OvirtProvisionPlugin:: Node provisioning is done."
+        logger.info "OvirtProvisionPlugin:: Node provisioning is done."
       else
         while max_tries > 0 && self.ovirt_host? && self.status_installing?
           if (self.error?)
-            logger.debug "OvirtProvisionPlugin:: Failed to run classes. Trying again (#{max_tries})"
+            logger.warn "OvirtProvisionPlugin:: Failed to run classes. Trying again (#{max_tries})"
             puppetrun!
             max_tries = max_tries - 1
           else
             begin
-              logger.debug "OvirtProvisionPlugin:: Running ovirt_host_callback on \"#{self.get_ovirt_host_name}\""
+              logger.info "OvirtProvisionPlugin:: Running ovirt_host_callback on \"#{self.get_ovirt_host_name}\""
               host_id = self.get_ovirt_host_id
               client = self.get_ovirt_client
               client.reinstall_host("#{host_id}")
-              logger.debug "OvirtProvisionPlugin:: Sent reinstall command successfully"
+              logger.info "OvirtProvisionPlugin:: Sent reinstall command successfully"
             rescue OVIRT::OvirtException
-              logger.debug "OvirtProvisionPlugin:: Failed to reinstall host. Trying again (#{max_tries})"
+              logger.warn "OvirtProvisionPlugin:: Failed to reinstall host. Trying again (#{max_tries})"
               puppetrun!
               max_tries = max_tries - 1
             end
@@ -33,7 +33,7 @@ module OvirtProvisionPlugin
     def is_ovirt_node?
       is_ovirt_node = self.operatingsystem.name == "oVirt-Node" or self.operatingsystem.name == "RHEV-H"
       if is_ovirt_node
-        logger.debug "OvirtProvisionPlugin:: Provisioned ovirt node host"
+        logger.info "OvirtProvisionPlugin:: Provisioned ovirt node host"
         return true
       end
       return false
@@ -41,7 +41,7 @@ module OvirtProvisionPlugin
 
     def ovirt_host?
       if self.get_ovirt_host_id
-        logger.debug "OvirtProvisionPlugin:: host related to oVirt"
+        logger.info "OvirtProvisionPlugin:: host related to oVirt"
         return true
       end
       return false
@@ -50,61 +50,66 @@ module OvirtProvisionPlugin
     def status_installing?
       h = self.get_ovirt_host
       if h != "" && h.status.strip == "installing_os"
-        logger.debug "OvirtProvisionPlugin:: host in status installing"
+        logger.info "OvirtProvisionPlugin:: host in status installing"
         return true
       end
       return false
     end
 
     def get_ovirt_client
-        begin
-            cr_id = parameters.find_by_name("compute_resource_id").value
-            cr = ComputeResource.find_by_id(cr_id)
-            return OVIRT::Client.new("#{cr.user}", "#{cr.password}", "#{cr.url}")
-        rescue OVIRT::OvirtException
-            logger.debug "OvirtProvisionPlugin:: compute resource id was not found"
-            return false
-        rescue NoMethodError
-            logger.debug "OvirtProvisionPlugin:: fail to read compute_rescource_id on host #{self.name}, id #{cr_id}"
-            return false
-        else
-            logger.debug "OvirtProvisionPlugin:: error occured during get_ovirt_client"
-            return false
+      begin
+        cr_id = parameters.find_by_name("compute_resource_id").value
+        cr = ComputeResource.find_by_id(cr_id)
+        connection_opts = {}
+        if not cr.public_key.blank?
+          connection_opts[:datacenter_id] = cr.uuid
+          connection_opts[:ca_cert_store] = OpenSSL::X509::Store.new.add_cert(OpenSSL::X509::Certificate.new(cr.public_key))
         end
+        return OVIRT::Client.new("#{cr.user}", "#{cr.password}", "#{cr.url}", connection_opts)
+      rescue OVIRT::OvirtException
+        logger.error "OvirtProvisionPlugin:: compute resource id was not found"
+        return false
+      rescue NoMethodError
+        logger.error "OvirtProvisionPlugin:: fail to read compute_rescource_id on host #{self.name}, id #{cr_id}"
+        return false
+      else
+        logger.error "OvirtProvisionPlugin:: error occured during get_ovirt_client"
+        return false
+      end
     end
 
     def get_ovirt_host
-        client = self.get_ovirt_client
-        if not client
-            logger.debug "OvirtProvisionPlugin:: couldn't get ovirt_host"
-            return ""
-        else
-            return client.host(get_ovirt_host_id)
-        end
+      client = self.get_ovirt_client
+      if not client
+        logger.error "OvirtProvisionPlugin:: couldn't get ovirt_host"
+        return ""
+      else
+        return client.host(get_ovirt_host_id)
+      end
     end
 
     def get_ovirt_host_name
-        h = self.get_ovirt_host
-        if not h
-            return ""
-        else
-            return h.name
-        end
+      h = self.get_ovirt_host
+      if not h
+        return ""
+      else
+        return h.name
+      end
     end
 
     def get_ovirt_host_id
-        begin
-            return self.parameters.find_by_name("host_ovirt_id").value
-        rescue OVIRT::OvirtException
-            logger.debug "OvirtProvisionPlugin:: host ovirt id was not found"
-            return false
-        rescue NoMethodError
-            logger.debug "OvirtProvisionPlugin:: fail to read host_ovirt_id on host #{self.name}"
-            return false
-        else
-            logger.debug "OvirtProvisionPlugin:: error occured during get_ovirt_host_id"
-            return false
-        end
+      begin
+        return self.parameters.find_by_name("host_ovirt_id").value
+      rescue OVIRT::OvirtException
+        logger.error "OvirtProvisionPlugin:: host ovirt id was not found"
+        return false
+      rescue NoMethodError
+        logger.error "OvirtProvisionPlugin:: fail to read host_ovirt_id on host #{self.name}"
+        return false
+      else
+        logger.error "OvirtProvisionPlugin:: error occured during get_ovirt_host_id"
+        return false
+      end
     end
   end
 end

data/lib/ovirt_provision_plugin/version.rb

@@ -1,3 +1,3 @@
 module OvirtProvisionPlugin
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ovirt_provision_plugin
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Yaniv Bronhaim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface