dopv 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1efa5fc9e9c48829ffa021a943dcf8cd4b989e99
-  data.tar.gz: f17df818250d5f25586c42bfa9565bea1fd8af43
+  metadata.gz: b629f251875fa5a722c8653bf7fc876ed61351d3
+  data.tar.gz: 2f8482900d2ba04f2b9cd8fb95d40f6e272f60af
 SHA512:
-  metadata.gz: 2c664c03979578a689f4acef0786a9588c1212c67d1dc5a250c64e8c17af79b00bb93f97cf839683d2bdac6f9359573666f4863fc09ef38b1998bc980f5d68a0
-  data.tar.gz: cc23756967cf69347c3254c6ce091915d1894efabf5cf3a24c8bb044377ae85c5d5d7108e762505140807f7387beb8cdc172b258535b938cb22b7daa4a1db327
+  metadata.gz: d7732db19befd3c9598343dd1df16f8765336ebedd227692bbf8ca3c7c128d913afd481037c9efebc98ca259998323b9500e8d02ccbc404f19a4636253e193cf
+  data.tar.gz: 7e6ac4f822ad2379a33786ad1b5ee8653437175a9646fdeb99439197df0ca11e759ea9c4a5adf9b85d110c1a4254a030de09e7a18588e7205ad86419d14cd736

data/ChangeLog.md

@@ -1,3 +1,15 @@
+# 0.13.0 24.04.2017
+## [deps]
+   * Update `dop_common`
+
+## [vsphere]
+ * Some minor fixes and improvements
+   * Fix typo customization_domain_password in `customize_node_instance`
+   * Addition filtering apipa and ipv6 in `get_node_ip_addresses`
+   * Add ability to transform disks during clone from template (see plan node property thin_clone)
+   * Add missing requires
+   * Cleanup unnecessary delegators
+
 # 0.12.0 07.04.2017
 ## [vsphere]
  * Improve `destroy_node`
@@ -6,7 +18,7 @@
    * 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
+   * Add ability to join domain or workgroup
  * Some minor fixes and improvements
    * `@wait_params` to instance
    * Handling of properties thin/thick provisioning, timezone and product_id

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    dopv (0.11.0)
-      dop_common (~> 0.13, >= 0.13.0)
+    dopv (0.13.0)
+      dop_common (~> 0.14, >= 0.14.0)
       fog (~> 1.36.0)
       fog-google (< 0.1.1)
       fog-profitbricks (~> 0.0.5)
@@ -25,7 +25,7 @@ GEM
     docile (1.1.5)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
-    dop_common (0.13.0)
+    dop_common (0.14.0)
       hashdiff (~> 0.3, >= 0.3.1)
       hiera (~> 3)
       lockfile (~> 2)
@@ -202,7 +202,7 @@ GEM
       builder
       nokogiri (>= 1.4.1)
       trollop
-    rest-client (2.0.1)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
@@ -210,7 +210,7 @@ GEM
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-command (1.0.1)
+    rspec-command (1.0.2)
       mixlib-shellout (~> 2.0)
       rspec (~> 3.2)
       rspec-its (~> 1.2)
@@ -237,7 +237,7 @@ GEM
     trollop (2.1.2)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
+    unf_ext (0.0.7.4)
     xml-simple (1.1.5)
 
 PLATFORMS

data/dopv.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fog-profitbricks", "~> 0.0.5" # fog dependency but fog-profitbricks > 0.5 requires ruby 2.x
   spec.add_dependency "fog", "~> 1.36.0"
   spec.add_dependency "gli", "~> 2.13.1"
-  spec.add_dependency "dop_common", "~> 0.13", '>= 0.13.0'
+  spec.add_dependency "dop_common", "~> 0.14", '>= 0.14.0'
   spec.add_dependency 'parallel', '~> 1'
   if RUBY_VERSION < "2"
     spec.add_dependency "rest-client", "< 2.0"

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

@@ -1,6 +1,7 @@
 require 'rbvmomi'
 require 'digest/sha2'
 require 'fog'
+require 'resolv'
 
 module Dopv
   module Infrastructure
@@ -8,7 +9,7 @@ module Dopv
     class Vsphere < Base
       extend Forwardable
 
-      def_delegators :@plan, :product_id, :organization_name, :domain, :workgroup
+      def_delegators :@plan, :product_id, :organization_name, :workgroup, :thin_clone
 
       def initialize(node_config, data_disks_db, wait_params={})
         super(node_config, data_disks_db)
@@ -68,9 +69,15 @@ module Dopv
       def create_node_instance
         ::Dopv::log.info("Node #{nodename}: Creating node instance.")
         @node_creation_opts['datastore'] = infrastructure_properties.default_pool unless infrastructure_properties.default_pool.nil?
-        vm = compute_provider.vm_clone(@node_creation_opts.merge(
-          'power_on'  => false,
-          'wait'      => true))
+        @node_creation_opts['transform'] = thin_clone ? :sparse : :flat unless thin_clone.nil?
+
+        vm = compute_provider.vm_clone(
+          @node_creation_opts.merge(
+            'power_on'  => false,
+            'wait'      => true
+          )
+        )
+
         compute_provider.servers.get(vm['new_vm']['id'])
       end
 
@@ -140,7 +147,7 @@ module Dopv
                               if domain
                                 customization_domain_password_settings = (RbVmomi::VIM::CustomizationPassword.new(
                                   :plainText => true,
-                                  :value => customize_domain_password(domain)
+                                  :value => customization_domain_password(domain)
                                 ) rescue nil)
                                 customization_id = RbVmomi::VIM::CustomizationIdentification.new(
                                   :joinDomain => domain,
@@ -361,6 +368,7 @@ module Dopv
 
       def get_node_ip_addresses(node_instance)
         begin
+          is_windows = guest_id_to_os_family(node_instance) == :windows
           raise ProviderError, "VMware Tools not installed" unless node_instance.tools_installed?
 
           ::Dopv::log.debug("Node #{nodename}: Waiting on VMware Tools for #{@wait_params[:maxtime]} seconds.")
@@ -373,7 +381,6 @@ module Dopv
           node_ref_guest_net = nil
           start_time = Time.now.to_f
           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
 
@@ -394,7 +401,7 @@ module Dopv
 
         rescue Exception => e
           ::Dopv::log.debug("Node #{nodename}: Unable to obtain IP Addresses, Error: #{e.message}.")
-          [node_instance.public_ip_address].compact
+          [node_instance.public_ip_address].compact.select{|i| i.match(Resolv::IPv4::Regex) && !(i.start_with?('169.254.') && is_windows)}
         end
       end
     end

data/lib/dopv/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dopv
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Pavol Dilung
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -289,20 +289,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement