chef-provisioning-opennebula 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be70c3a2ff409635c15cdb3983c4947e526b1af4
-  data.tar.gz: f0d93e05af640ebc8672f0ad9ed7cf83d5f41a94
+  metadata.gz: 04a47001d99e4d12e8d704f0f441e80582955566
+  data.tar.gz: d7a148664849bd390c62620eb80434077a4bcb0d
 SHA512:
-  metadata.gz: 432068196cae2b47b31b434588493dba50f99972d4d06004ca6ffd0dc60c54b448b7ef6ee049951c87833a451259ed9bd3b4ea4806beca28185a2c4bb2d885bf
-  data.tar.gz: 957716c65b152719733f36643b1629b511c392f28e9c4459dec66eb5a8041708c7c4a1c958dacae2835e1f9f4e4199e88840d43be2207d8d2c360446653b6703
+  metadata.gz: 0c92fd314d1d51900a3d6ea3ce52316fa6ebf5123c988fe815b2e1fdb2a926ddc790cd9b657f51cd6799c6790a91ced34b040e3c71a681a6d555e787d8c8cef7
+  data.tar.gz: 209eb0984670a5ecfe358c8db13369952ccec9f988b2698dc3eca504df14988a32610cf560a4fae163830ebf85e7d51588f7ad8bf7d0e5947c1bfcb5e3dd7ed3

data/lib/chef/provisioning/opennebula_driver/driver.rb

@@ -87,7 +87,12 @@ class Chef
           require 'opennebula'
         rescue Gem::LoadError => e
           e_inspect = e.inspect
-          raise e unless e_inspect.include?('already activated')
+          unless e_inspect.include?('already activated')
+            info_out, info_err = Open3.capture2e("gem environment")
+            Chef::Log.fatal("Please check your environment settings")
+            Chef::Log.fatal(info_out + "\n" + info_err)
+            raise e
+          end
         end
         require 'chef/provisioning/opennebula_driver/one_lib'
         gem_version = Gem.loaded_specs['opennebula'].version.to_s
@@ -203,6 +208,10 @@ class Chef
           return machine_spec unless instance.nil?
 
           unless machine_options[:bootstrap_options]
+            instance = retry_one("Retrying allocate_machine.instance_for (missing bootstrap options)") do
+              instance_for(machine_spec)
+            end
+            return machine_spec unless instance.nil?
             fail "'bootstrap_options' must be specified"
           end
           check_unique_names(machine_options, machine_spec)
@@ -643,25 +652,12 @@ class Chef
 
           transport = Chef::Provisioning::Transport::SSH.new(machine_spec.reference['ip'], username, ssh_options, options, config)
 
-          rc = retryable_operation("Waiting for SSH connection", connection_timeout.to_i) { transport.available? }
+          retries = connection_timeout.to_i / 3
+          rc = @one.retry_one("Waiting for SSH connection", retries, 3) { transport.available? ? true : nil }
           fail "Failed to establish SSH connection to '#{machine_spec.name}'" if rc.nil?
           transport
         end
 
-        # Retry an operation until the timeout expires.  Will always try at least once.
-        def retryable_operation(msg = "operation", timeout = 15, delay = 3)
-          return nil unless block_given?
-          start = Time.now
-          loop do
-            return true if yield
-            Chef::Log.info(msg)
-            sleep delay
-            break if (Time.now - start) > timeout
-          end
-          Chef::Log.error("Timed out waiting for operation to complete: '#{msg}'")
-          nil
-        end
-
         def convergence_strategy_for(machine_spec, machine_options)
           # TODO: Support Windoze VMs (see chef-provisioning-vagrant)
           convergence_options = Cheffish::MergedConfig.new(machine_options ? machine_options[:convergence_options] || {} : {})

data/lib/chef/provisioning/opennebula_driver/one_lib.rb

@@ -173,34 +173,41 @@ class Chef
           fail "Did not find VM with ID: #{id}" unless vm
 
           # Wait up to 10 min for the VM to be ready
-          rc = retryable_operation("wait for VM #{id} to be ready", 600, 2) do
+          rc = retry_one("wait for VM #{id} to be ready", 300, 2) do
             vm.info
             if vm.lcm_state_str != 'LCM_INIT'
               short_lcm = OpenNebula::VirtualMachine::SHORT_LCM_STATES[vm.lcm_state_str]
               fail "'#{vm.name}'' failed.  Current state: #{vm.lcm_state_str}" if short_lcm == 'fail'
             end
             fail "'#{vm.name}'' failed.  Current state: #{vm.state_str}" if vm.state_str == 'FAILED'
-            Chef::Log.info("current state: '#{vm.lcm_state_str}'  short: '#{short_lcm}'")
-            OpenNebula::Error.new("Waiting") unless vm.lcm_state_str.casecmp(end_state) == 0
+            Chef::Log.info("current state #{vm.name}: '#{vm.lcm_state_str}'  short: '#{short_lcm}'")
+            vm.lcm_state_str.casecmp(end_state) == 0 ? true : nil
           end
           fail "wait_for_vm timed out: '#{id}'" if rc.nil?
           vm
         end
 
-        # Retry an OpenNebula operation until the timeout expires.  Will always try at least once.
-        def retryable_operation(msg = "operation", timeout = 15, delay = 2)
+        # Retry ONE operation
+        def retry_one(msg = "retry_one", retries = 3, retry_delay = 5, return_nil = false, return_error = false)
           return nil unless block_given?
-          start = Time.now
+          count = 1
           rc = nil
           loop do
             rc = yield
-            return true unless OpenNebula.is_error?(rc)
             Chef::Log.info(msg)
-            sleep delay
-            break if (Time.now - start) > timeout
+            if OpenNebula.is_error?(rc)
+              return rc if return_error
+            elsif rc.nil?
+              return rc if return_nil
+            else
+              return rc
+            end
+            sleep retry_delay
+            break if count == retries
+            count += 1
           end
-          Chef::Log.info("Timed out waiting for OpenNebula operation.  Got error #{rc.message} from OpenNebula.")
-          nil
+          Chef::Log.info("FAIL: one_lib.retry_one '#{msg}'")
+          rc
         end
 
         def rename_vm(res, name)
@@ -269,7 +276,7 @@ DEV_PREFIX = #{img_config[:prefix]}
           state = 'INIT'
           pool = get_pool(:image)
 
-          retryable_operation("wait for IMAGE #{img_id} to be ready", 600, 2) do
+          retry_one("wait for IMAGE #{img_id} to be ready", 600, 2) do
             pool.info!(-2, img_id, img_id)
             pool.each do |img|
               next unless img.id == img_id
@@ -279,7 +286,7 @@ DEV_PREFIX = #{img_config[:prefix]}
               state = cur_state
               break
             end
-            OpenNebula::Error.new("Waiting") if state == 'INIT' || state == 'LOCKED'
+            (state == 'INIT' || state == 'LOCKED') ? nil : true
           end
           fail "Failed to create #{name} image. State = '#{state}'" if state != 'READY'
           Chef::Log.info("Image #{name} is in READY state")
@@ -368,10 +375,6 @@ DEV_PREFIX = #{img_config[:prefix]}
           unless t_hash['CONTEXT']['SSH_PUBLIC_KEY']
             t_hash['CONTEXT']['SSH_PUBLIC_KEY'] = "$USER[SSH_PUBLIC_KEY]"
           end
-          unless t_hash['CONTEXT']['USER_DATA']
-            t_hash['CONTEXT']['USER_DATA'] = "#cloud-config\n" \
-                                             "manage_etc_hosts: true\n"
-          end
           tpl = create_template(t_hash)
           Chef::Log.debug(tpl)
           tpl

data/lib/chef/provisioning/opennebula_driver/version.rb

@@ -24,7 +24,7 @@ class Chef
     # Extending module.
     #
     module OpenNebulaDriver
-      VERSION = '0.4.6'.freeze
+      VERSION = '0.4.7'.freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-opennebula
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Andrew J. Brown
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -96,6 +96,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.3
+- !ruby/object:Gem::Dependency
+  name: http-cookie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement