chef-provisioning-opennebula 0.4.4 → 0.4.6

data/lib/chef/provider/one_flow_template.rb

@@ -0,0 +1,175 @@
+# Copyright 2016, BlackBerry Limited
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'rest-client'
+require 'json'
+
+#
+# Implementation of Provider class.
+#
+class Chef
+  #
+  # Implementation of Provider class.
+  #
+  class Provider
+    #
+    # Implementation of Provider class.
+    #
+    class OneFlowTemplate < Chef::Provider::LWRPBase
+      use_inline_resources
+
+      provides :one_flow_template
+
+      def initialize(*args)
+        super
+        if !@new_resource.flow_url.nil?
+          flow_url = @new_resource.flow_url
+        elsif !run_context.chef_provisioning.flow_url.nil?
+          flow_url = run_context.chef_provisioning.flow_url
+        elsif !ENV['ONE_FLOW_URL'].nil?
+          flow_url = ENV['ONE_FLOW_URL']
+        else
+          fail 'OneFlow API URL must be specified.'
+        end
+        @flow_lib = Chef::Provisioning::OpenNebulaDriver::FlowLib.new(flow_url, driver.one.client.one_auth)
+      end
+
+      def whyrun_supported?
+        true
+      end
+
+      def load_current_resource
+        @current_resource = Chef::Resource::OneFlowTemplate.new(@new_resource.name, run_context)
+
+        template_name = @new_resource.name
+
+        unless @new_resource.template.nil?
+          tpl = load_template_hash
+          if tpl.nil?
+            @current_resource.exists = false
+            return
+          end
+          tpl = @flow_lib.merge_template(tpl, @new_resource.template_options, true, false)
+          template_name = tpl[:name] if tpl.key?(:name)
+        end
+
+        template_id = @flow_lib.get_unique_template_id(template_name, true)
+
+        @current_resource.exists = !template_id.nil?
+        return unless @current_resource.exists
+
+        @current_resource.template(@flow_lib.get_template(template_id))
+        @current_resource.mode(@flow_lib.get_template_permissions(template_id))
+
+        @current_resource.template_equal = @new_resource.template.nil? ? true : @flow_lib.hash_eq?(
+          @current_resource.template,
+          @flow_lib.normalize_template(@new_resource.name, driver, @flow_lib.merge_template(@current_resource.template, tpl), true)
+        )
+        @current_resource.mode_equal = @current_resource.mode == @new_resource.mode
+        @current_resource.equal = @current_resource.template_equal && @current_resource.mode_equal
+      end
+
+      def load_template_hash
+        template = {}
+        case @new_resource.template
+        when Hash
+          template = @new_resource.template
+        when Fixnum
+          template = @flow_lib.get_template(@new_resource.template)
+        when String
+          case @new_resource.template
+          when %r{^file://(.*)$}
+            template = JSON.parse(::File.read(Regexp.last_match[1]), :symbolize_names => true)
+          when %r{^(?:(\w+)(?::(.*?))?@)?(https?://.*)$}
+            response = RestClient::Request.execute(
+              method: :get,
+              url: Regexp.last_match[3],
+              user: Regexp.last_match[1],
+              password: Regexp.last_match[2]
+            )
+            template = JSON.parse(response, :symbolize_names => true)
+          else
+            tid = @flow_lib.get_unique_template_id(@new_resource.template)
+            template = @flow_lib.get_template(tid)
+          end
+        end
+        template
+      end
+
+      action :create do
+        fail 'Cannot specify template_options without a template' if !@current_resource.template_options.empty? && @current_resource.template_options.nil?
+
+        template_name = @new_resource.name
+
+        unless @new_resource.template.nil?
+          template = load_template_hash
+
+          if @new_resource.template_options.key?(:name)
+            template_name = @new_resource.template_options[:name]
+          elsif template.key?(:name)
+            template_name = template[:name]
+          end
+        end
+
+        if @current_resource.exists
+          unless @current_resource.equal
+            converge_by "updated template '#{template_name}'" do
+              template_id = @flow_lib.get_unique_template_id(template_name)
+              unless @new_resource.template.nil? && @current_resource.template_equal
+                template = @flow_lib.normalize_template(
+                  @new_resource.name,
+                  driver,
+                  @flow_lib.merge_template(template, @new_resource.template_options, true, false),
+                  true,
+                  true
+                )
+                template = @flow_lib.normalize_template(@new_resource.name, driver, @flow_lib.merge_template(@current_resource.template, template))
+                @flow_lib.update_template(template_name, template)
+              end
+              unless @current_resource.mode_equal
+                @flow_lib.chmod_template(template_id, @new_resource.mode)
+              end
+              @new_resource.updated_by_last_action(true)
+            end
+          end
+        else
+          fail 'Cannot create template without template attribute' if @new_resource.template.nil?
+          converge_by "created template '#{template_name}'" do
+            template = @flow_lib.normalize_template(@new_resource.name, driver, @flow_lib.merge_template(template, @new_resource.template_options, true))
+            @flow_lib.create_template(template)
+            template_id = @flow_lib.get_unique_template_id(template_name)
+            @flow_lib.chmod_template(template_id, @new_resource.mode)
+            @new_resource.updated_by_last_action(true)
+          end
+        end
+      end
+
+      action :delete do
+        if @current_resource.exists
+          template_id = @flow_lib.get_unique_template_id(@new_resource.name, true)
+          converge_by "deleted template '#{@new_resource.name}'" do
+            @flow_lib.delete_template(template_id)
+            @new_resource.updated_by_last_action(true)
+          end
+        end
+      end
+
+      protected
+
+      def driver
+        @new_resource.driver.nil? ? run_context.chef_provisioning.current_driver : run_context.chef_provisioning.driver_for(@new_resource.driver)
+      end
+    end
+  end
+end

data/lib/chef/provider/one_image.rb

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ class Chef
 
       action :allocate do
         if exists?
-          action_handler.report_progress "image '#{new_resource.name}' already exists - nothing to do"
+          action_handler.report_progress "image '#{new_resource.name}' already exists - (up to date)"
         else
           fail "'size' must be specified" unless new_resource.size
           fail "'datastore_id' must be specified" unless new_resource.datastore_id
@@ -81,7 +81,7 @@ class Chef
             @new_resource.updated_by_last_action(true)
           end
         when 'READY', 'USED', 'USED_PERS'
-          action_handler.report_progress "image '#{new_resource.name}' is already in #{@image.state_str} state - nothing to do"
+          action_handler.report_progress "image '#{new_resource.name}' is already in #{@image.state_str} state - (up to date)"
         else
           fail "Image #{new_resource.name} is in unexpected state '#{@image.state_str}'"
         end
@@ -99,7 +99,7 @@ class Chef
             @new_resource.updated_by_last_action(true)
           end
         else
-          action_handler.report_progress "image '#{new_resource.name}' does not exist - nothing to do"
+          action_handler.report_progress "image '#{new_resource.name}' does not exist - (up to date)"
         end
       end
 
@@ -120,7 +120,7 @@ class Chef
 
           disk_id = new_driver.one.get_disk_id(vm, disk_hash['IMAGE']['NAME'])
           if !disk_id.nil?
-            action_handler.report_progress "disk is already attached" unless disk_id.nil?
+            action_handler.report_progress "disk is already attached - (up to date)" unless disk_id.nil?
           elsif disk_id.nil?
             action_handler.report_progress "disk not attached, attaching..."
             rc = vm.disk_attach(disk_tpl)
@@ -187,7 +187,7 @@ class Chef
              @image['TEMPLATE/DRIVER'] == image_config[:driver] &&
              @image['TEMPLATE/DESCRIPTION'] == image_config[:description] &&
              @image['DATASTORE_ID'] == image_config[:datastore_id]
-            action_handler.report_progress("image '#{@new_resource.name}' (ID: #{@image.id}) already exists - nothing to do")
+            action_handler.report_progress("image '#{@new_resource.name}' (ID: #{@image.id}) already exists - (up to date)")
           else
             fail "image '#{new_resource.name}' already exists, but it is not the same image"
           end

data/lib/chef/provider/one_template.rb

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Ltd.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -139,12 +139,10 @@ class Chef
       end
 
       def create_template
-        if new_resource.template_file && new_resource.template.size > 0
-          fail("Attributes 'template_file' and 'template' are mutually " \
-               'exclusive.')
-        elsif new_resource.template_file
+        fail("Attributes 'template_file' and 'template' are mutually 'exclusive.'") if new_resource.template_file && !new_resource.template.empty?
+        if new_resource.template_file
           ::File.read(new_resource.template_file)
-        elsif new_resource.template.size > 0
+        elsif !new_resource.template.empty?
           driver.one.create_template(new_resource.template)
         else
           fail("Missing attribute 'template_file' or 'template' in " \

data/lib/chef/provider/one_user.rb

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ class Chef
         fail "Missing attribute 'password'" unless @new_resource.password
 
         if exists?(:name => @new_resource.name)
-          action_handler.report_progress "user '#{@new_resource.name}' already exists - nothing to do"
+          action_handler.report_progress "user '#{@new_resource.name}' already exists - (up to date)"
         else
           action_handler.perform_action "create user '#{@new_resource.name}'" do
             user = OpenNebula::User.new(OpenNebula::User.build_xml, @client)
@@ -65,22 +65,19 @@ class Chef
             @new_resource.updated_by_last_action(true)
           end
         else
-          action_handler.report_progress "user '#{new_resource.name}' does not exists - nothing to do"
+          action_handler.report_progress "user '#{new_resource.name}' does not exists - (up to date)"
         end
       end
 
       action :update do
-        if exists?(:id => @new_resource.user_id, :name => @new_resource.name)
-          fail "':template' or ':template_file' attribute missing" if !@new_resource.template && !@new_resource.template_file
-          # hash = @current_user.to_hash
-          tpl = new_driver.one.create_template(@new_resource.template) if @new_resource.template
-          tpl = ::File.read(@new_resource.template_file) if @new_resource.template_file
+        fail "user '#{new_resource.name}' does not exists" unless exists?(:id => @new_resource.user_id, :name => @new_resource.name)
+        fail "':template' or ':template_file' attribute missing" unless @new_resource.template || @new_resource.template_file
 
-          rc = @current_user.update(tpl, true)
-          fail "failed to update user '#{@new_resource.name}': #{rc.message}" if OpenNebula.is_error?(rc)
-        else
-          fail "user '#{new_resource.name}' does not exists"
-        end
+        tpl = new_driver.one.create_template(@new_resource.template) if @new_resource.template
+        tpl = ::File.read(@new_resource.template_file) if @new_resource.template_file
+
+        rc = @current_user.update(tpl, true)
+        fail "failed to update user '#{@new_resource.name}': #{rc.message}" if OpenNebula.is_error?(rc)
       end
 
       protected
@@ -89,7 +86,7 @@ class Chef
         if current_driver && current_driver.driver_url != new_driver.driver_url
           fail "Cannot move '#{machine_spec.name}' from #{current_driver.driver_url} to #{new_driver.driver_url}: machine moving is not supported.  Destroy and recreate."
         end
-        fail "Driver not specified for one_image #{new_resource.name}" unless new_driver
+        fail "Driver not specified for one_user #{new_resource.name}" unless new_driver
         new_driver
       end
 

data/lib/chef/provider/one_vnet.rb

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ class Chef
         fail "Missing attribute 'cluster_id'" unless @new_resource.cluster_id
 
         if exists?(:name => @new_resource.name)
-          action_handler.report_progress "vnet '#{@new_resource.name}' already exists - nothing to do"
+          action_handler.report_progress "vnet '#{@new_resource.name}' already exists - (up to date)"
         else
           action_handler.perform_action "created vnet '#{@new_resource.name}' from '#{@new_resource.template_file}'" do
             template_str = ::File.read(@new_resource.template_file) + "\nNAME=\"#{@new_resource.name}\""
@@ -67,7 +67,7 @@ class Chef
             @new_resource.updated_by_last_action(true)
           end
         else
-          action_handler.report_progress "vnet '#{new_resource.name}' does not exists - nothing to do"
+          action_handler.report_progress "vnet '#{new_resource.name}' does not exists - (up to date)"
         end
       end
 
@@ -86,11 +86,8 @@ class Chef
           else
             same = ar_pool[0]['AR']['SIZE'].to_i == @new_resource.size
           end
-          if same
-            action_handler.report_progress "vnet '#{@new_resource.name}' already exists - nothing to do"
-          else
-            fail "vnet '#{@new_resource.name}' exists with different configuration"
-          end
+          fail "vnet '#{@new_resource.name}' exists with different configuration" unless same
+          action_handler.report_progress "vnet '#{@new_resource.name}' already exists - (up to date)"
         else
           fail "parent network '#{@new_resource.network}' does not exist" unless exists?(:id => @new_resource.network)
           action_handler.perform_action "reserved vnet '#{@new_resource.name}'" do
@@ -107,7 +104,7 @@ class Chef
         if current_driver && current_driver.driver_url != new_driver.driver_url
           fail "Cannot move '#{machine_spec.name}' from #{current_driver.driver_url} to #{new_driver.driver_url}: machine moving is not supported.  Destroy and recreate."
         end
-        fail "Driver not specified for one_image #{new_resource.name}" unless new_driver
+        fail "Driver not specified for one_vnet #{new_resource.name}" unless new_driver
         new_driver
       end
 

data/lib/chef/provider/one_vnet_lease.rb

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@ class Chef
             @new_resource.updated_by_last_action(true)
           end
         else
-          action_handler.report_progress("#{@new_resource.name} is not present - nothing do to")
+          action_handler.report_progress("#{@new_resource.name} is not present - (up to date)")
         end
       end
 
@@ -102,7 +102,7 @@ class Chef
         if current_driver && current_driver.driver_url != new_driver.driver_url
           fail "Cannot move '#{machine_spec.name}' from #{current_driver.driver_url} to #{new_driver.driver_url}: machine moving is not supported.  Destroy and recreate."
         end
-        fail "Driver not specified for one_image #{new_resource.name}" unless new_driver
+        fail "Driver not specified for one_vnet_lease #{new_resource.name}" unless new_driver
         new_driver
       end
 

data/lib/chef/provisioning/driver_init/opennebula.rb

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/chef/provisioning/driver_init/server_version.rb

@@ -0,0 +1,28 @@
+# Copyright 2016, BlackBerry Limited
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'opennebula'
+require 'json'
+
+endpoint = ARGV[0].dup
+credentials = ARGV[1].dup
+options = JSON.parse(ARGV[2].dup)
+
+version = OpenNebula::Client.new(credentials, endpoint, options).get_version
+
+if version.is_a?(String)
+  puts version
+else
+  puts version.inspect
+end

data/lib/chef/provisioning/opennebula_driver.rb

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ class Chef
         end
 
         def default
-          fail 'No credentials loaded!  Do you have a ~/.one/one_auth file?' if @credentials.size == 0
+          fail 'No credentials loaded!  Do you have a ~/.one/one_auth file?' if @credentials.empty?
           @credentials[ENV['ONE_DEFAULT_PROFILE'] || 'default'] || @credentials.first[1]
         end
 

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

@@ -1,4 +1,4 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry Limited
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,13 +19,88 @@ require 'chef/provisioning/convergence_strategy/install_sh'
 require 'chef/provisioning/convergence_strategy/no_converge'
 require 'chef/provisioning/transport/ssh'
 require 'chef/provisioning/opennebula_driver/version'
-require 'chef/provisioning/opennebula_driver/one_lib'
 require 'chef/provisioning/opennebula_driver/credentials'
 require 'net/ssh/proxy/command'
+require 'json'
+require 'open3'
+
+class Chef
+  module DSL
+    #
+    # Module extension.
+    #
+    module Recipe
+      def with_flow_url(url)
+        run_context.chef_provisioning.with_flow_url(url)
+      end
+    end
+  end
+end
+
+class Chef
+  module Provisioning
+    #
+    # Class extension.
+    #
+    class ChefRunData
+      attr_accessor :flow_url
+      def with_flow_url(url)
+        @flow_url = url
+      end
+    end
+  end
+end
 
 class Chef
   module Provisioning
+    # OpenNebulaDriver module.
     module OpenNebulaDriver
+      def self.match_driver_url(url, allow_nil_profile = false)
+        scan = url.match(%r/opennebula:(https?:\/\/[^:\/]+ (?::[0-9]{2,5})? (?:\/[^:\s]+) ) :?([^:\s]+)?/x)
+        fail "'driver_url' option has invalid format: #{url}" if scan.nil?
+        endpoint = scan[1]
+        profile = scan[2]
+        fail "'driver_url' option is missing an endpoint: #{url}" if endpoint.nil?
+        fail "'driver_url' option is missing a profile: #{url}" if profile.nil? && !allow_nil_profile
+        [endpoint, profile]
+      end
+
+      def self.get_onelib(args)
+        endpoint = args[:endpoint]
+        credentials = args[:credentials]
+        options = args[:options] || {}
+        if args[:driver_url]
+          fail "OpenNebula driver_url cannot be #{args[:driver_url].class}, it must be a String" unless args[:driver_url].is_a?(String)
+          endpoint, profile = Chef::Provisioning::OpenNebulaDriver.match_driver_url(args[:driver_url])
+          one_profile = Chef::Provisioning::OpenNebulaDriver::Credentials.new[profile]
+          credentials = one_profile[:credentials]
+          options = one_profile[:options] || {}
+        end
+        fail "OpenNebula credentials cannot be #{credentials.class}, it must be a String" unless credentials.is_a?(String)
+        fail "OpenNebula endpoint cannot be #{endpoint.class}, it must be a String" unless endpoint.is_a?(String)
+        fail "OpenNebula options cannot be #{options.class}, it must be a Hash" unless options.is_a?(Hash)
+        server_version, = Open3.capture2e("ruby #{File.dirname(__FILE__)}/../driver_init/server_version.rb #{endpoint} #{credentials} #{options.to_json.inspect}")
+        server_version.strip!
+        fail server_version unless server_version =~ /^\d+\.\d+(?:\.\d+)?$/
+        begin
+          gem 'opennebula', "~> #{server_version}"
+          require 'opennebula'
+        rescue Gem::LoadError => e
+          e_inspect = e.inspect
+          raise e unless e_inspect.include?('already activated')
+        end
+        require 'chef/provisioning/opennebula_driver/one_lib'
+        gem_version = Gem.loaded_specs['opennebula'].version.to_s
+        if gem_version == server_version
+          Chef::Log.debug("You are using OpenNebula gem version #{gem_version} against OpenNebula server version #{server_version}")
+        else
+          Chef::Log.warn('OPENNEBULA GEM / SERVER VERSION MISMATCH')
+          Chef::Log.warn("You are using OpenNebula gem version #{gem_version} against OpenNebula server version #{server_version}")
+          Chef::Log.warn('Users may experience issues with this gem.')
+        end
+        OneLib.new(:credentials => credentials, :endpoint => endpoint, :options => options)
+      end
+
       #
       # A Driver instance represents a place where machines can be created
       # and found, and contains methods to create, delete, start, stop, and
@@ -81,11 +156,14 @@ class Chef
         #
         # driver_options:
         #   credentials: bbsl-auto:text_pass  credentials has precedence over secret_file
-        #   secret_file: local_path_to_one_auth_file
+        #   endpoint: opennebula endpoint
+        #   options: additional options for OpenNebula::Client
         #
         def initialize(driver_url, config)
           super
-          @one = OneLib.new(:driver_url => driver_url)
+          @one = Chef::Provisioning::OpenNebulaDriver.get_onelib(:driver_url => driver_url)
+          @driver_url_with_profile = driver_url
+          @driver_url = @one.client.one_endpoint
         end
 
         def self.from_url(driver_url, config)
@@ -124,17 +202,17 @@ class Chef
           instance = instance_for(machine_spec)
           return machine_spec unless instance.nil?
 
-          unless machine_options.bootstrap_options
+          unless machine_options[:bootstrap_options]
             fail "'bootstrap_options' must be specified"
           end
           check_unique_names(machine_options, machine_spec)
           action_handler.perform_action "created vm '#{machine_spec.name}'" do
             Chef::Log.debug(machine_options)
             tpl = @one.get_template(machine_spec.name,
-                                    machine_options.bootstrap_options)
+                                    machine_options[:bootstrap_options])
             vm = @one.allocate_vm(tpl)
             populate_node_object(machine_spec, machine_options, vm)
-            @one.chmod_resource(vm, machine_options.bootstrap_options[:mode])
+            @one.chmod_resource(vm, machine_options[:bootstrap_options][:mode])
 
             # This option allows to manipulate how the machine shows up
             # in the OpenNebula UI and CLI tools.  We either set the VM
@@ -224,11 +302,17 @@ class Chef
               end
               fail "Failed to destroy '#{instance.name}'.  Current state: #{instance.state_str}" if instance.state_str != 'DONE'
             end
+          elsif machine_spec.reference
+            Chef::Log.info("vm #{machine_spec.name} (#{machine_spec.reference['instance_id']}) does not exist - (up to date)")
           else
-            Chef::Log.info("vm #{machine_spec.name} (#{machine_spec.reference['instance_id']}) does not exist - nothing to do")
+            Chef::Log.info("vm #{machine_spec.name} does not exist - (up to date)")
+          end
+          begin
+            strategy = convergence_strategy_for(machine_spec, machine_options)
+            strategy.cleanup_convergence(action_handler, machine_spec)
+          rescue Net::HTTPServerException => e
+            raise unless e.response.code == '404'
           end
-          strategy = convergence_strategy_for(machine_spec, machine_options)
-          strategy.cleanup_convergence(action_handler, machine_spec)
         end
 
         # Stop the given machine.
@@ -251,7 +335,7 @@ class Chef
               end
             end
           else
-            Chef::Log.info("vm #{machine_spec.name} (#{machine_spec.reference['instance_id']}) does not exist - nothing to do")
+            Chef::Log.info("vm #{machine_spec.name} (#{machine_spec.reference['instance_id']}) does not exist - (up to date)")
           end
         end
 
@@ -314,7 +398,7 @@ class Chef
         def destroy_image(action_handler, image_spec, _image_options)
           img = @one.get_resource(:image, :id => image_spec.location['image_id'].to_i)
           if img.nil?
-            action_handler.report_progress "image #{image_spec.name} (#{image_spec.location['image_id']}) does not exist - nothing to do"
+            action_handler.report_progress "image #{image_spec.name} (#{image_spec.location['image_id']}) does not exist - (up to date)"
           else
             action_handler.perform_action "deleted image #{image_spec.name} (#{image_spec.location['image_id']})" do
               rc = img.delete
@@ -413,6 +497,7 @@ class Chef
         # @param [Array[ChefMetal::MachineSpec]] machine_specs
         #        An array of machine specs the load balancer should have
         def allocate_load_balancer(_action_handler, _lb_spec, _lb_options, _machine_specs)
+          fail "'allocate_load_balancer' is not implemented"
         end
 
         # Make the load balancer ready
@@ -420,6 +505,7 @@ class Chef
         # @param [ChefMetal::LoadBalancerSpec] lb_spec Frozen LB specification
         # @param [Hash] lb_options A hash of options to pass the LB
         def ready_load_balancer(_action_handler, _lb_spec, _lb_options, _machine_specs)
+          fail "'ready_load_balancer' is not implemented"
         end
 
         # Destroy the load balancer
@@ -427,6 +513,7 @@ class Chef
         # @param [ChefMetal::LoadBalancerSpec] lb_spec Frozen LB specification
         # @param [Hash] lb_options A hash of options to pass the LB
         def destroy_load_balancer(_action_handler, _lb_spec, _lb_options)
+          fail "'destroy_load_balancer' is not implemented"
         end
 
         protected
@@ -444,7 +531,7 @@ class Chef
         end
 
         def check_unique_names(machine_options, machine_spec)
-          return unless machine_options.bootstrap_options[:unique_names]
+          return unless machine_options[:bootstrap_options][:unique_names]
           hostname = if machine_options[:vm_name] == :short
                        machine_spec.name.split('.').first
                      elsif machine_options[:vm_name].is_a?(String)
@@ -458,13 +545,13 @@ class Chef
         end
 
         def populate_node_object(machine_spec, machine_options, vm)
-          machine_spec.driver_url = driver_url
+          machine_spec.driver_url = @driver_url_with_profile
           machine_spec.reference = {
             'driver_version' => Chef::Provisioning::OpenNebulaDriver::VERSION,
             'allocated_at' => Time.now.utc.to_s,
-            'image_id' => machine_options.bootstrap_options[:image_id] || nil,
-            'is_shutdown' => machine_options.bootstrap_options[:is_shutdown] || false,
-            'shutdown_hard' => machine_options.bootstrap_options[:shutdown_hard] || false,
+            'image_id' => machine_options[:bootstrap_options][:image_id] || nil,
+            'is_shutdown' => machine_options[:bootstrap_options][:is_shutdown] || false,
+            'shutdown_hard' => machine_options[:bootstrap_options][:shutdown_hard] || false,
             'instance_id' => vm.id,
             'name' => vm.name,
             'state' => vm.state_str
@@ -478,7 +565,7 @@ class Chef
         end
 
         def populate_img_object(image_spec, new_image)
-          image_spec.driver_url = driver_url
+          image_spec.driver_url = @driver_url_with_profile
           image_spec.reference = {
             'driver_version' => Chef::Provisioning::OpenNebulaDriver::VERSION,
             'image_id'       => new_image,
@@ -492,13 +579,15 @@ class Chef
         def instance_for(machine_spec)
           instance = nil
           if machine_spec.reference
-            fail "Switching a machine's driver from #{machine_spec.driver_url} to #{driver_url} is not supported!" \
-                "  Use machine :destroy and then :create the machine on the new driver." if machine_spec.driver_url != driver_url
+            current_endpoint, = Chef::Provisioning::OpenNebulaDriver.match_driver_url(machine_spec.driver_url, true)
+            fail "Cannot move '#{machine_spec.name}' from #{current_endpoint} to #{driver_url}: machine moving is not supported.  Destroy and recreate." if current_endpoint != driver_url
             instance = @one.get_resource(:virtualmachine, :id => machine_spec.reference['instance_id'].to_i)
+            machine_spec.driver_url = @driver_url_with_profile
           elsif machine_spec.location
-            fail "Switching a machine's driver from #{machine_spec.driver_url} to #{driver_url} is not supported!" \
-                "  Use machine :destroy and then :create the machine on the new driver." if machine_spec.driver_url != driver_url
+            current_endpoint, = Chef::Provisioning::OpenNebulaDriver.match_driver_url(machine_spec.driver_url, true)
+            fail "Cannot move '#{machine_spec.name}' from #{current_endpoint} to #{driver_url}: machine moving is not supported.  Destroy and recreate." if current_endpoint != driver_url
             instance = @one.get_resource(:virtualmachine, :id => machine_spec.location['server_id'].to_i)
+            machine_spec.driver_url = @driver_url_with_profile
             unless instance.nil?
               # Convert from previous driver
               machine_spec.reference = {
@@ -518,9 +607,11 @@ class Chef
           instance = instance_for(machine_spec)
           fail "#{machine_spec.name} (#{machine_spec.reference['instance_id']}) does not exist!" if instance.nil?
           # TODO: Support Windoze VMs (see chef-provisioning-vagrant)
-          Chef::Provisioning::Machine::UnixMachine.new(machine_spec,
-                                                       transport_for(machine_spec, machine_options, instance),
-                                                       convergence_strategy_for(machine_spec, machine_options))
+          Chef::Provisioning::Machine::UnixMachine.new(
+            machine_spec,
+            transport_for(machine_spec, machine_options, instance),
+            convergence_strategy_for(machine_spec, machine_options)
+          )
         end
 
         def get_ssh_user(machine_spec, machine_options)
@@ -539,7 +630,7 @@ class Chef
           }.merge(machine_options[:ssh_options] || {})
           ssh_options[:proxy] = Net::SSH::Proxy::Command.new(ssh_options[:proxy]) if ssh_options.key?(:proxy)
 
-          connection_timeout = machine_options[:connection_timeout] || 300
+          connection_timeout = machine_options[:connection_timeout] || 300 # default is 5 min
           username = get_ssh_user(machine_spec, machine_options)
 
           options = {}
@@ -552,21 +643,28 @@ class Chef
 
           transport = Chef::Provisioning::Transport::SSH.new(machine_spec.reference['ip'], username, ssh_options, options, config)
 
-          # wait up to 5 min to establish SSH connection
-          connect_sleep = 3
+          rc = retryable_operation("Waiting for SSH connection", connection_timeout.to_i) { transport.available? }
+          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
-            break if transport.available?
-            fail "Failed to establish SSH connection to '#{machine_spec.name}'" if Time.now > start + connection_timeout.to_i
-            Chef::Log.info("Waiting for SSH server ...")
-            sleep connect_sleep
+            return true if yield
+            Chef::Log.info(msg)
+            sleep delay
+            break if (Time.now - start) > timeout
           end
-          transport
+          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[:convergence_options] || {})
+          convergence_options = Cheffish::MergedConfig.new(machine_options ? machine_options[:convergence_options] || {} : {})
 
           if !machine_spec.reference
             Chef::Provisioning::ConvergenceStrategy::NoConverge.new(convergence_options, config)