dopv 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04b5fc85ce634cdb291b2a38bb329278f5124764
-  data.tar.gz: 2907715f813769b45dfdeb1cce85c569e6d146b5
+  metadata.gz: 1efa5fc9e9c48829ffa021a943dcf8cd4b989e99
+  data.tar.gz: f17df818250d5f25586c42bfa9565bea1fd8af43
 SHA512:
-  metadata.gz: d2ebca4cb926ef33f761f860d1b854ce7201e2bfc64c909ef691f4754c021f0b2385f4716214b4838ec0896fbfddfea76e458fef97ab6c2a0c075105a1f84562
-  data.tar.gz: 7e0d5be2228cd57889fff41bca94d606d767c53edb875a615ac5ef614b6a4138a677566b703c9b6c7ded73256380286cbdd03c2a52487eda5da5263ec9ac6fc0
+  metadata.gz: 2c664c03979578a689f4acef0786a9588c1212c67d1dc5a250c64e8c17af79b00bb93f97cf839683d2bdac6f9359573666f4863fc09ef38b1998bc980f5d68a0
+  data.tar.gz: cc23756967cf69347c3254c6ce091915d1894efabf5cf3a24c8bb044377ae85c5d5d7108e762505140807f7387beb8cdc172b258535b938cb22b7daa4a1db327

data/ChangeLog.md

@@ -1,3 +1,16 @@
+# 0.12.0 07.04.2017
+## [vsphere]
+ * Improve `destroy_node`
+   * Waiting for poweredOff vm state
+ * Improve `get_node_ip_addresses`
+   * Filtering apipa and ipv6
+   * Skipping if vm tools unmanaged or has no connected guest network interface
+ * Improve `customize_node_instance` windows sysprep
+   * Add possibility to join domain or workgroup
+ * Some minor fixes and improvements
+   * `@wait_params` to instance
+   * Handling of properties thin/thick provisioning, timezone and product_id
+
 # 0.11.0 29.03.2017
 ## [general]
  * Split log files by nodes

data/Gemfile.lock

@@ -23,7 +23,7 @@ GEM
     coderay (1.1.1)
     diff-lcs (1.3)
     docile (1.1.5)
-    domain_name (0.5.20170223)
+    domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     dop_common (0.13.0)
       hashdiff (~> 0.3, >= 0.3.1)
@@ -68,7 +68,7 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (1.2.1)
+    fog-aws (1.3.0)
       fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
@@ -137,9 +137,9 @@ GEM
     fog-xenserver (0.3.0)
       fog-core
       fog-xml
-    fog-xml (0.1.2)
+    fog-xml (0.1.3)
       fog-core
-      nokogiri (~> 1.5, >= 1.5.11)
+      nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.2.5)
     gli (2.13.4)
     guard (2.14.1)

data/lib/dopv/infrastructure/providers/vsphere.rb

@@ -8,9 +8,9 @@ module Dopv
     class Vsphere < Base
       extend Forwardable
 
-      def_delegators :@plan, :product_id, :organization_name
+      def_delegators :@plan, :product_id, :organization_name, :domain, :workgroup
 
-      def initialize(node_config, data_disks_db)
+      def initialize(node_config, data_disks_db, wait_params={})
         super(node_config, data_disks_db)
 
         @compute_connection_opts = {
@@ -30,6 +30,11 @@ module Dopv
           'numCPUs'       => cores,
           'memoryMB'      => memory.mebibytes.to_i
         }
+
+        @wait_params = {
+          :maxtime        => 300,
+          :delay          => 10
+        }.merge(wait_params)
       end
 
       private
@@ -42,6 +47,20 @@ module Dopv
         super || '085'
       end
 
+      def timezone_to_index(timezone)
+        lookup_table = {
+          'Europe/Zurich'         => 110,
+          :default                => 110
+        }
+
+        unless timezone.match(/^[1-9][0-9][0-9]$/)
+          (lookup_table.key? timezone) ?
+            lookup_table[timezone].to_s : lookup_table[:default].to_s
+        else
+          timezone
+        end
+      end
+
       def node_instance_stopped?(node_instance)
         !node_instance.ready?
       end
@@ -55,6 +74,25 @@ module Dopv
         compute_provider.servers.get(vm['new_vm']['id'])
       end
 
+      def customization_domain_credential(domain)
+        credentials.find { |c| c.type == :username_password && c.username.start_with?(domain) }
+      end
+
+      def customization_domain?(domain)
+        cred = customization_domain_credential(domain)
+        !cred.nil?
+      end
+
+      def customization_domain_password(domain)
+        cred = customization_domain_credential(domain)
+        cred.nil? ? nil : cred.password
+      end
+
+      def customization_domain_username(domain)
+        cred = customization_domain_credential(domain)
+        cred.nil? ? nil : cred.username.split('\\').last
+      end
+
       def customize_node_instance(node_instance)
         ::Dopv::log.info("Node #{nodename}: Customizing node.")
         # Settings related to each network interface
@@ -81,35 +119,61 @@ module Dopv
 
         # Identity settings
         identity_settings = case guest_id_to_os_family(node_instance)
+
                             when :linux
+
                               RbVmomi::VIM::CustomizationLinuxPrep.new(
                                 :domain => domainname,
                                 :hostName => RbVmomi::VIM::CustomizationFixedName.new(:name => hostname)
                               )
+
                             when :windows
+
                               password_settings = (RbVmomi::VIM::CustomizationPassword.new(
                                 :plainText => true,
                                 :value => administrator_password
                               ) rescue nil)
+
+                              # Declare identification
+                              domain ||= customization_domain?(domainname) ? domainname : nil
+                              workgroup ||= nil
+                              if domain
+                                customization_domain_password_settings = (RbVmomi::VIM::CustomizationPassword.new(
+                                  :plainText => true,
+                                  :value => customize_domain_password(domain)
+                                ) rescue nil)
+                                customization_id = RbVmomi::VIM::CustomizationIdentification.new(
+                                  :joinDomain => domain,
+                                  :domainAdmin => customization_domain_username(domain),
+                                  :domainAdminPassword => customization_domain_password_settings
+                                )
+                              elsif workgroup
+                                customization_id = RbVmomi::VIM::CustomizationIdentification.new(
+                                  :joinWorkgroup => workgroup
+                                )
+                              else
+                                customization_id = RbVmomi::VIM::CustomizationIdentification.new(
+                                  :domainAdmin => nil,
+                                  :domainAdminPassword => nil,
+                                  :joinDomain => nil
+                                )
+                              end
+
                               RbVmomi::VIM::CustomizationSysprep.new(
                                 :guiRunOnce => nil,
                                 :guiUnattended => RbVmomi::VIM::CustomizationGuiUnattended.new(
                                   :autoLogon => false,
                                   :autoLogonCount => 1,
                                   :password => password_settings,
-                                  :timeZone => timezone
-                              ),
-                                :identification => RbVmomi::VIM::CustomizationIdentification.new(
-                                  :domainAdmin => nil,
-                                  :domainAdminPassword => nil,
-                                  :joinDomain => nil
-                              ),
+                                  :timeZone => timezone_to_index(timezone)
+                                ),
+                                :identification => customization_id,
                                 :userData => RbVmomi::VIM::CustomizationUserData.new(
                                   :computerName => RbVmomi::VIM::CustomizationFixedName.new(:name => hostname),
                                   :fullName => administrator_fullname,
                                   :orgName => organization_name,
-                                  :productId => product_id
-                              )
+                                  :productId => (!product_id ? '' : product_id)
+                                )
                               )
                             else
                               raise ProviderError, "Unsupported guest OS type"
@@ -134,6 +198,11 @@ module Dopv
         node_instance.start
       end
 
+      def stop_node_instance(node_instance)
+        super(node_instance)
+        node_instance.wait_for(@wait_params[:maxtime]){power_state.to_sym == :poweredOff}
+      end
+
       def add_node_nics(node_instance)
         ::Dopv::log.info("Node #{nodename}: Trying to add interfaces.")
 
@@ -162,7 +231,7 @@ module Dopv
           :datastore => config.pool,
           :size => config.size.kibibytes.to_i,
           :mode => 'persistent',
-          :thin => true
+          :thin => config.thin?
         )
         node_instance.volumes.reload
         volume.name = config.name
@@ -290,30 +359,41 @@ module Dopv
         @provider_pubkey_hash
       end
 
-      def get_node_ip_addresses(node_instance, params={})
+      def get_node_ip_addresses(node_instance)
         begin
           raise ProviderError, "VMware Tools not installed" unless node_instance.tools_installed?
-          params = {:maxtime => 300, :delay => 10}.merge(params)
-          ::Dopv::log.debug("Node #{nodename}: Waiting on VMware Tools for #{params[:maxtime]} seconds.")
+
+          ::Dopv::log.debug("Node #{nodename}: Waiting on VMware Tools for #{@wait_params[:maxtime]} seconds.")
           reload_node_instance(node_instance)
-          node_instance.wait_for(params[:maxtime]){|vm| vm.ready?}
-          node_instance.wait_for(params[:maxtime]){|vm| vm.tools_running?}
+          node_instance.wait_for(@wait_params[:maxtime]){ready?}
+          node_instance.wait_for(@wait_params[:maxtime]){tools_running?}
+          raise ProviderError, "VMware Tools Version not supported" if node_instance.tools_version.to_sym == :guestToolsUnmanaged
+
           node_ref = compute_provider.send(:get_vm_ref, node_instance.id)
           node_ref_guest_net = nil
           start_time = Time.now.to_f
-          while (Time.now.to_f - start_time) < params[:maxtime]
+          is_connected = false
+          is_windows = guest_id_to_os_family(node_instance) == :windows
+          node_ref.guest.net.each do |i| is_connected ||= i.connected end
+          raise ProviderError, "No connected network interface available" unless is_connected
+
+          while (Time.now.to_f - start_time) < @wait_params[:maxtime]
             unless node_ref.guest_ip
-              sleep params[:delay]
+              sleep @wait_params[:delay]
             else
-              node_ref_guest_net = node_ref.guest.net
-              break
+              node_ref_guest_net = node_ref.guest.net.map(&:ipAddress).flatten.uniq.compact.select{|i| i.match(Resolv::IPv4::Regex) && !(i.start_with?('169.254.') && is_windows)}
+              unless node_ref_guest_net.any?
+                sleep @wait_params[:delay]
+              else
+                break
+              end
             end
           end
           raise ProviderError, "VMware Tools not ready yet" unless node_ref_guest_net
-          node_ref_guest_net.map(&:ipAddress).flatten.uniq.compact
+          node_ref_guest_net
 
         rescue Exception => e
-          ::Dopv::log.debug("Node #{nodename}: Unable to get all IP Addresses, Error:  #{e.message}.")
+          ::Dopv::log.debug("Node #{nodename}: Unable to obtain IP Addresses, Error: #{e.message}.")
           [node_instance.public_ip_address].compact
         end
       end

data/lib/dopv/version.rb

@@ -1,3 +1,3 @@
 module Dopv
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dopv
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Pavol Dilung
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -386,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Deployment orchestrator for VMs