chef-provisioning-oneview 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fd131178c928b19abb6e06f8136b4d3b9e9a2eb
-  data.tar.gz: 80c192d8030a22b2d78ac8e58328265b83231718
+  metadata.gz: c6e2ebd112f8cb2206a8129177013c86dcf7c5a3
+  data.tar.gz: 08b98d7116f8f185dff1c56f1d4cae90a6121352
 SHA512:
-  metadata.gz: 5e901b072f088b01d67943bda4af6aedcfb73e7eb5514388fda9e1d27df911f3c2c738daea6b8f7f7d696fc8145d784a15989a1e007bb03c814dbebae60bd53a
-  data.tar.gz: e5a12ab051c95788e8e6dc4e0c62e7d50caa8c810e16662e37f3fd76e91dd95dc9737181ba8a9330237636a313cef0ff50f2dd6c037c319a735de7c3bac185cf
+  metadata.gz: b085577a2d4a4a2679de0376d86f7d2ebaf095ec5181140550028c19bfebfb083b24dee139c3d40eceacc0a9977bded027ade2f4d679bc4b0c46e79b5794463e
+  data.tar.gz: 8edd83dcebba1e142d15da9abfece53fa0a945292570eb75bac79f882c4f136ce016036335ab512de2cacbcd99f89d6d493b3cb7e0aa2ce172223cbc6766db3b

data/README.md

@@ -1,5 +1,5 @@
 # chef-provisioning-oneview
-Chef Provisioning driver for HP OneView
+Chef Provisioning driver for HPE OneView
 
 
 [![Build Status](https://travis-ci.org/HewlettPackard/chef-provisioning-oneview.svg?branch=master)](https://travis-ci.org/HewlettPackard/chef-provisioning-oneview)
@@ -14,17 +14,16 @@ Currently supports:
 
 # Installation
 
-- Install Ruby and the `ruby-devel` or `ruby-dev` package for your system.
-  
-- Require the gem in your Gemfile: `gem 'chef-provisioning-oneview'`
-  
-  Then run `$ bundle install`
-- Or run the command:
-  
+- This program is meant to run inside the chef-client, so to install it, add the following to a Chef recipe and run it:
   ```ruby
-  $ gem install chef-provisioning-oneview
+  chef_gem 'chef-provisioning-oneview'
   ```
-
+  
+- To install it on your system Ruby for development purposes:
+  - Install Ruby and the `ruby-devel` or `ruby-dev` package for your system.
+    
+  - Option 1: Require the gem in your Gemfile: `gem 'chef-provisioning-oneview'`, then run `$ bundle install`
+  - Option 2: Run the command: `$ gem install chef-provisioning-oneview`
 
 
 # Prerequisites
@@ -37,6 +36,7 @@ Currently supports:
   knife[:oneview_username]   = 'Administrator'
   knife[:oneview_password]   = 'password123'
   knife[:oneview_ignore_ssl] = true # For self-signed certs
+  knife[:oneview_timeout]    = 10 # Optional. 10 (seconds) is the default
   
   knife[:icsp_url]           = 'https://my-icsp.my-domain.com'
   knife[:icsp_username]      = 'Administrator'
@@ -53,6 +53,8 @@ Currently supports:
 - Your OneView, Insight Controll Server Provisioning(ICSP), and Chef server must be trusted by your certificate stores. See [examples/ssl_issues.md](examples/ssl_issues.md) for more info on how to do this.
 - Your OneView and ICSP servers must be set up beforehand. Unfortunately, this driver doesn't do that for you too.
 
+Note: ICSP is no longer required, so if you don't want to use it, you can leave those config options from your knife.rb.
+
 # Usage
 
 Example recipe:
@@ -69,17 +71,18 @@ machine 'web01' do
   recipe 'my_server_cookbook::default'
 
   machine_options :driver_options => {
-      :server_template => 'Web Server Template',
-      :os_build => 'CHEF-RHEL-6.5-x64',
+      :server_template => 'Web Server Template', # Name of Template OR Server Profile
+      :os_build => 'CHEF-RHEL-6.5-x64', # Name of OS Build Plan on ICSP. Supports array of strings also.
+      :server_location => 'Encl1, bay 16', # Optional. Use to provision a specific server
+      
       :host_name => 'chef-web01',
       :ip_address => 'xx.xx.xx.xx', # For bootstrapping. Deprecated in favor of { bootstrap: true } in connection; see below
-      
       :domainType => 'workgroup',
       :domainName => 'sub.domain.com',
       :mask => '255.255.255.0', # Can set here or in individual connections below
-      :dhcp => false,
-      :gateway =>  'xx.xx.xx.1',
-      :dns => 'xx.xx.xx.xx,xx.xx.xx.xx,xx.xx.xx.xx',
+      :dhcp => false, # Can set here or in individual connections below
+      :gateway =>  'xx.xx.xx.1', # Can set here or in individual connections below
+      :dns => 'xx.xx.xx.xx,xx.xx.xx.xx,xx.xx.xx.xx', # Can set here or in individual connections below
       :connections => {
         #1 => { ... } (Reserved for PXE on our setup)
         2 => {
@@ -172,6 +175,10 @@ Add `:team => 'TeamName'` into a connection in your connections hash. Make sure
 This repo contains everything you need to get started, including example recipes and knife configuration files. See the README in the [examples](examples/) directory for how to begin provisioning.
 
 
+# Troubleshooting
+See the [Trouleshooting wiki page](https://github.com/HewlettPackard/chef-provisioning-oneview/wiki/Troubleshooting)
+
+
 # Contributing
 You know the drill. Fork it, branch it, change it, commit it, pull-request it. We're passionate about improving this driver, and glad to accept help to make it better.
 

data/lib/chef/provisioning/create_machine.rb

@@ -5,8 +5,6 @@ module CreateMachine
   def create_machine(action_handler, machine_spec, machine_options)
     host_name = machine_options[:driver_options][:host_name]
 
-    auth_tokens # Login (to both ICSP and OneView)
-
     # Check if profile exists first
     matching_profiles = rest_api(:oneview, :get, "/rest/server-profiles?filter=name matches '#{host_name}'&sort=name:asc")
     if matching_profiles['count'] > 0
@@ -18,7 +16,8 @@ module CreateMachine
     template = get_oneview_template(machine_options[:driver_options][:server_template])
 
     # Get first availabe (and compatible) HP OV server blade
-    chosen_blade = available_hardware_for_template(template)
+    # If a server_location has been specified, uses that
+    chosen_blade = available_hardware_for_template(template, machine_options[:driver_options][:server_location])
 
     power_off(action_handler, machine_spec, chosen_blade['uri'])
 
@@ -38,7 +37,7 @@ module CreateMachine
       task = rest_api(:oneview, :post, '/rest/server-profiles', options)
       task_uri = task['uri']
       raise "Failed to create OneView server profile #{host_name}. Details: " unless task_uri
-      # Wait for profile to be created
+      # Wait for profile to appear
       60.times do # Wait for up to 5 min
         matching_profiles = rest_api(:oneview, :get, "/rest/server-profiles?filter=name matches '#{host_name}'&sort=name:asc")
         return matching_profiles['members'].first if matching_profiles['members'].first

data/lib/chef/provisioning/customize_machine.rb

@@ -3,22 +3,8 @@ module CustomizeMachine
 
   # Use ICSP to install OS
   def customize_machine(action_handler, machine_spec, machine_options, profile)
-    auth_tokens # Login (to both ICSP and OneView)
-
     # Wait for server profile to finish building
-    unless profile['state'] == 'Normal'
-      action_handler.perform_action "Wait for #{machine_spec.name} server to start and profile to be applied" do
-        action_handler.report_progress "INFO: Waiting for #{machine_spec.name} server to start and profile to be applied"
-        task = oneview_wait_for(profile['taskUri'], 360) # Wait up to 60 min for profile to be created
-        raise 'Timed out waiting for server to start and profile to be applied' if task == false
-        unless task == true
-          server_template = machine_options[:driver_options][:server_template]
-          raise "Error creating server profile from template #{server_template}: #{task['taskErrors'].first['message']}"
-        end
-      end
-      profile = get_oneview_profile_by_sn(machine_spec.reference['serial_number']) # Refresh profile
-      raise "Server profile state '#{profile['state']}' not 'Normal'" unless profile['state'] == 'Normal'
-    end
+    wait_for_profile(action_handler, machine_spec, machine_options, profile)
 
     # Configure SAN storage (if applicable)
     enable_boot_from_san(action_handler, machine_spec, profile) unless machine_spec.reference['network_personalitation_finished']

data/lib/chef/provisioning/oneview/oneview_api.rb

@@ -16,7 +16,7 @@ module OneViewAPI
         raise 'API version type mismatch' if !version > 0
       end
     rescue
-      puts 'Failed to get OneView API version. Setting to default (120)'
+      Chef::Log.warn 'Failed to get OneView API version. Setting to default (120)'
       version = 120
     end
     version
@@ -69,7 +69,7 @@ module OneViewAPI
     raise "Template '#{template_name}' not found! Please match the template name with one that exists on OneView."
   end
 
-  def available_hardware_for_template(template)
+  def available_hardware_for_template(template, location = nil)
     server_hardware_type_uri = template['serverHardwareTypeUri']
     enclosure_group_uri      = template['enclosureGroupUri']
     raise 'Template must specify a valid hardware type uri!' if server_hardware_type_uri.nil? || server_hardware_type_uri.empty?
@@ -77,8 +77,11 @@ module OneViewAPI
     params = "sort=name:asc&filter=serverHardwareTypeUri='#{server_hardware_type_uri}'&filter=serverGroupUri='#{enclosure_group_uri}'"
     blades = rest_api(:oneview, :get, "/rest/server-hardware?#{params}")
     raise 'Error! No available blades that are compatible with the server template!' unless blades['count'] > 0
+    Chef::Log.debug "Specific hardware requested: #{location}" if location
     blades['members'].each do |member|
-      return member if member['state'] == 'NoProfileApplied'
+      next unless member['state'] == 'NoProfileApplied'
+      next if location && member['name'] != location
+      return member
     end
     raise 'No more blades are available for provisioning!' # Every bay is full and no more machines can be allocated
   end
@@ -100,6 +103,23 @@ module OneViewAPI
     false
   end
 
+  def wait_for_profile(action_handler, machine_spec, machine_options, profile)
+    unless profile['state'] == 'Normal'
+      action_handler.perform_action "Wait for #{machine_spec.name} server to start and profile to be applied" do
+        action_handler.report_progress "INFO: Waiting for #{machine_spec.name} server to start and profile to be applied"
+        task = oneview_wait_for(profile['taskUri'], 360) # Wait up to 60 min for profile to be created
+        raise 'Timed out waiting for server to start and profile to be applied' if task == false
+        unless task == true
+          server_template = machine_options[:driver_options][:server_template]
+          raise "Error creating server profile from template #{server_template}: #{task['taskErrors'].first['message']}"
+        end
+      end
+      profile = get_oneview_profile_by_sn(machine_spec.reference['serial_number']) # Refresh profile
+      raise "Server profile state '#{profile['state']}' not 'Normal'" unless profile['state'] == 'Normal'
+    end
+  end
+
+
   def power_on(action_handler, machine_spec, hardware_uri = nil)
     set_power_state(action_handler, machine_spec, 'on', hardware_uri)
   end

data/lib/chef/provisioning/oneview_driver.rb

@@ -6,7 +6,6 @@ require 'chef/provisioning/driver'
 require 'chef/provisioning/transport/ssh'
 require 'chef/provisioning/machine/unix_machine'
 require 'json'
-require 'ridley'
 require_relative 'driver_init/oneview'
 require_relative 'version'
 require_relative 'rest'
@@ -23,6 +22,7 @@ module Chef::Provisioning
     include OneViewAPI
     include ICspAPI
 
+
     def self.canonicalize_url(url, config)
       _scheme, oneview_url = url.split(':', 2)
       if oneview_url.nil? || oneview_url == ''
@@ -40,26 +40,35 @@ module Chef::Provisioning
       super(canonical_url, config)
 
       @oneview_base_url    = config[:knife][:oneview_url]
-      raise 'Must set the knife[:oneview_url] attribute!' if @oneview_base_url.nil? || @oneview_base_url.empty?
       @oneview_username    = config[:knife][:oneview_username]
-      raise 'Must set the knife[:oneview_username] attribute!' if @oneview_username.nil? || @oneview_username.empty?
       @oneview_password    = config[:knife][:oneview_password]
-      raise 'Must set the knife[:oneview_password] attribute!' if @oneview_password.nil? || @oneview_password.empty?
       @oneview_disable_ssl = config[:knife][:oneview_ignore_ssl]
+      @api_timeout         = config[:knife][:oneview_timeout] || 10 # Default timeout: 10 seconds
+      raise 'Must set knife[:oneview_url] attribute!'      if @oneview_base_url.nil? || @oneview_base_url.empty?
+      raise 'Must set knife[:oneview_username] attribute!' if @oneview_username.nil? || @oneview_username.empty?
+      raise 'Must set knife[:oneview_password] attribute!' if @oneview_password.nil? || @oneview_password.empty?
       @oneview_api_version = 120 # Use this version for all calls that don't override it
       @current_oneview_api_version = get_oneview_api_version
+      Chef::Log.debug("Logging into OneView at #{@oneview_base_url}")
       @oneview_key         = login_to_oneview
 
       @icsp_base_url       = config[:knife][:icsp_url]
-      raise 'Must set the knife[:icsp_url] attribute!' if @icsp_base_url.nil? || @icsp_base_url.empty?
       @icsp_username       = config[:knife][:icsp_username]
-      raise 'Must set the knife[:icsp_username] attribute!' if @icsp_username.nil? || @icsp_username.empty?
       @icsp_password       = config[:knife][:icsp_password]
-      raise 'Must set the knife[:icsp_password] attribute!' if @icsp_password.nil? || @icsp_password.empty?
       @icsp_disable_ssl    = config[:knife][:icsp_ignore_ssl]
       @icsp_api_version    = 102 # Use this version for all calls that don't override it
-      @current_icsp_api_version = get_icsp_api_version
-      @icsp_key            = login_to_icsp
+
+      Chef::Log.warn 'knife[:icsp_url] not set in knife.rb!'      if @icsp_base_url.nil?
+      Chef::Log.warn 'knife[:icsp_username] not set in knife.rb!' if @icsp_username.nil?
+      Chef::Log.warn 'knife[:icsp_password] not set in knife.rb!' if @icsp_password.nil?
+
+      @icsp_ignore = @icsp_base_url.nil? || @icsp_username.nil? || @icsp_password.nil?
+      # If the config is not specified, skip ICSP
+      unless @icsp_ignore
+        Chef::Log.debug("Logging into ICSP at #{@icsp_base_url}")
+        @current_icsp_api_version = get_icsp_api_version
+        @icsp_key = login_to_icsp
+      end
     end
 
 
@@ -93,12 +102,19 @@ module Chef::Provisioning
       end
     end
 
-
     def ready_machine(action_handler, machine_spec, machine_options)
       profile = get_oneview_profile_by_sn(machine_spec.reference['serial_number'])
       raise "Failed to retrieve Server Profile for #{machine_spec.name}. Serial Number used to search: #{machine_spec.reference['serial_number']}" unless profile
-      customize_machine(action_handler, machine_spec, machine_options, profile)
-      machine_for(machine_spec, machine_options) # Return the Machine object
+      if @icsp_ignore == true
+        wait_for_profile(action_handler, machine_spec, machine_options, profile)
+        Chef::Log.warn('Action converge action being used, without an ICSP configuration')
+        Machine::BasicMachine.new(machine_spec, OneViewNilTransport.new, OneViewNilConvergence.new)
+      else
+        # This function takes care of installing the operating system etc. to the machine (blade)
+        customize_machine(action_handler, machine_spec, machine_options, profile)
+        # This is a provisining function and handles installing a chef-client
+        machine_for(machine_spec, machine_options) # Return the Machine object
+      end
     end
 
 
@@ -130,60 +146,39 @@ module Chef::Provisioning
         ssh_pty_enable: true
       }
       options = machine_options[:transport_options][:options] || default_options rescue default_options
-
       transport = Chef::Provisioning::Transport::SSH.new(bootstrap_ip_address, username, ssh_options, options, config)
       convergence_strategy = Chef::Provisioning::ConvergenceStrategy::InstallSh.new(
-        machine_options[:convergence_options], {})
+        machine_options[:convergence_options], {}
+      )
       Chef::Provisioning::Machine::UnixMachine.new(machine_spec, transport, convergence_strategy)
     end
 
-
     def stop_machine(action_handler, machine_spec, _machine_options)
       power_off(action_handler, machine_spec) if machine_spec.reference
     end
 
 
-    def destroy_machine(action_handler, machine_spec, machine_options)
+    def destroy_machine(action_handler, machine_spec, _machine_options)
       if machine_spec.reference
         power_off(action_handler, machine_spec) # Power off server
-        destroy_icsp_server(action_handler, machine_spec) # Delete os deployment server from ICSP
+        destroy_icsp_server(action_handler, machine_spec) unless @icsp_ignore # Delete os deployment server from ICSP
         destroy_oneview_profile(action_handler, machine_spec) # Delete server profile from OneView
 
         name = machine_spec.name # Save for next steps
 
-        # Delete the node from the Chef server
-        action_handler.perform_action "Release machine #{machine_spec.reference['serial_number']}" do
-          machine_spec.reference = nil
-          machine_spec.delete(action_handler)
-        end
-
-        # Delete client from the Chef server
-        action_handler.perform_action "Delete client '#{name}' from Chef server" do
-          begin
-            ridley = Ridley.new(
-              server_url:  machine_options[:convergence_options][:chef_server][:chef_server_url],
-              client_name: machine_options[:convergence_options][:chef_server][:options][:client_name],
-              client_key:  machine_options[:convergence_options][:chef_server][:options][:signing_key_filename]
-            )
-            ridley.client.delete(name)
-          rescue  Exception => e
-            action_handler.report_progress "WARN: Failed to delete client #{name} from server!"
-            puts "Error: #{e.message}"
-          end
-        end
-
         # Remove entry from known_hosts file(s)
-        if machine_options[:driver_options][:ip_address]
-          action_handler.perform_action "Delete entry for '#{machine_options[:driver_options][:ip_address]}' from known_hosts file(s)" do
+        ip_address = machine_spec.data['automatic']['ipaddress'] rescue nil
+        if ip_address
+          action_handler.perform_action "Delete entry for #{name} (#{ip_address}) from known_hosts file(s)" do
             files = [File.expand_path('~/.ssh/known_hosts'), File.expand_path('/etc/ssh/known_hosts')]
             files.each do |f|
-              next if !File.exist?(f)
+              next unless File.exist?(f)
               begin
                 text = File.read(f)
-                text.gsub!(/#{machine_options[:driver_options][:ip_address]} ssh-rsa.*(\n|\r\n)/, '')
+                text.gsub!(/#{ip_address} ssh-rsa.*(\n|\r\n)/, '')
                 File.open(f, 'w') {|file| file.puts text } if text
               rescue  Exception => e
-                action_handler.report_progress "WARN: Failed to delete entry for '#{machine_options[:driver_options][:ip_address]}' from known_hosts file: '#{f}'! "
+                action_handler.report_progress "WARN: Failed to delete entry for #{name} (#{ip_address}) from known_hosts file: '#{f}'! "
                 puts "Error: #{e.message}"
               end
             end
@@ -198,14 +193,24 @@ module Chef::Provisioning
       machine_for(machine_spec, machine_options)
     end
 
-    private
+  end # class end
 
-    # Login to both OneView and ICsp
-    def auth_tokens
-      @icsp_key  ||= login_to_icsp
-      @oneview_key ||= login_to_oneview
-      { 'icsp_key' => @icsp_key, 'oneview_key' => @oneview_key }
+  # Additional No-Op classes to nil return when a :converge is called
+  # Returns a OneViewTransport::disconnect (nil)
+  class OneViewNilTransport
+    def disconnect(*_args, &_block)
+      nil
     end
+  end
 
-  end # class end
+  # Additional Converge class that nils the called methods under a :converge action
+  class OneViewNilConvergence
+    def setup_convergence(*_args, &_block)
+      nil
+    end
+
+    def converge(*_args, &_block)
+      nil
+    end
+  end
 end # module end

data/lib/chef/provisioning/rest.rb

@@ -18,9 +18,10 @@ module RestAPI
     end
 
     http = Net::HTTP.new(uri.host, uri.port)
+    http.read_timeout = @api_timeout # timeout for a request
+    http.open_timeout = @api_timeout # timeout for a connection
     http.use_ssl = true if uri.scheme == 'https'
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE if disable_ssl
-
     case type.downcase
     when 'get', :get
       request = Net::HTTP::Get.new(uri.request_uri)

data/lib/chef/provisioning/version.rb

@@ -1,5 +1,5 @@
 class Chef
   module Provisioning
-    ONEVIEW_DRIVER_VERSION = '1.1.3'.freeze
+    ONEVIEW_DRIVER_VERSION = '1.2.0'.freeze
   end
 end

data/spec/shared_context.rb

@@ -11,6 +11,7 @@ RSpec.shared_context 'shared context', a: :b do
       oneview_username: 'Administrator',
       oneview_password: 'password12',
       oneview_ignore_ssl: true,
+      oneview_timeout: 15,
 
       icsp_url: icsp,
       icsp_username: 'administrator',

data/spec/unit/oneview_driver_spec.rb

@@ -24,11 +24,13 @@ RSpec.describe Chef::Provisioning::OneViewDriver do
       expect(@instance.instance_variable_get('@oneview_username')).to eq('Administrator')
       expect(@instance.instance_variable_get('@oneview_password')).to eq('password12')
       expect(@instance.instance_variable_get('@oneview_disable_ssl')).to eq(true)
+      expect(@instance.instance_variable_get('@api_timeout')).to eq(15)
 
       expect(@instance.instance_variable_get('@icsp_base_url')).to eq('https://my-icsp.my-domain.com')
       expect(@instance.instance_variable_get('@icsp_username')).to eq('administrator')
       expect(@instance.instance_variable_get('@icsp_password')).to eq('password123')
       expect(@instance.instance_variable_get('@icsp_disable_ssl')).to eq(nil)
+      expect(@instance.instance_variable_get('@icsp_ignore')).to eq(false)
     end
 
     it 'uses the correct api versions' do
@@ -40,32 +42,38 @@ RSpec.describe Chef::Provisioning::OneViewDriver do
 
     it 'requires the oneview_url knife param' do
       knife_config[:knife].delete(:oneview_url)
-      expect { Chef::Provisioning::OneViewDriver.new(@canonical_url, knife_config) }.to raise_error('Must set the knife[:oneview_url] attribute!')
+      expect { Chef::Provisioning::OneViewDriver.new(@canonical_url, knife_config) }.to raise_error('Must set knife[:oneview_url] attribute!')
     end
 
     it 'requires the oneview_username knife param' do
       knife_config[:knife].delete(:oneview_username)
-      expect { Chef::Provisioning::OneViewDriver.new(@canonical_url, knife_config) }.to raise_error('Must set the knife[:oneview_username] attribute!')
+      expect { Chef::Provisioning::OneViewDriver.new(@canonical_url, knife_config) }.to raise_error('Must set knife[:oneview_username] attribute!')
     end
 
     it 'requires the oneview_password knife param' do
       knife_config[:knife].delete(:oneview_password)
-      expect { Chef::Provisioning::OneViewDriver.new(@canonical_url, knife_config) }.to raise_error('Must set the knife[:oneview_password] attribute!')
+      expect { Chef::Provisioning::OneViewDriver.new(@canonical_url, knife_config) }.to raise_error('Must set knife[:oneview_password] attribute!')
     end
 
-    it 'requires the icsp_url knife param' do
+    it 'gives a warning if the knife[:icsp_url] is not set' do
       knife_config[:knife].delete(:icsp_url)
-      expect { Chef::Provisioning::OneViewDriver.new(@canonical_url, knife_config) }.to raise_error('Must set the knife[:icsp_url] attribute!')
+      expect(Chef::Log).to receive(:warn).with('knife[:icsp_url] not set in knife.rb!')
+      driver = Chef::Provisioning::OneViewDriver.new(@canonical_url, knife_config)
+      expect(driver.instance_variable_get('@icsp_ignore')).to eq(true)
     end
 
-    it 'requires the icsp_username knife param' do
+    it 'gives a warning if the knife[:icsp_username] is not set' do
       knife_config[:knife].delete(:icsp_username)
-      expect { Chef::Provisioning::OneViewDriver.new(@canonical_url, knife_config) }.to raise_error('Must set the knife[:icsp_username] attribute!')
+      expect(Chef::Log).to receive(:warn).with('knife[:icsp_username] not set in knife.rb!')
+      driver = Chef::Provisioning::OneViewDriver.new(@canonical_url, knife_config)
+      expect(driver.instance_variable_get('@icsp_ignore')).to eq(true)
     end
 
-    it 'requires the icsp_password knife param' do
+    it 'gives a warning if the knife[:icsp_password] is not set' do
       knife_config[:knife].delete(:icsp_password)
-      expect { Chef::Provisioning::OneViewDriver.new(@canonical_url, knife_config) }.to raise_error('Must set the knife[:icsp_password] attribute!')
+      expect(Chef::Log).to receive(:warn).with('knife[:icsp_password] not set in knife.rb!')
+      driver = Chef::Provisioning::OneViewDriver.new(@canonical_url, knife_config)
+      expect(driver.instance_variable_get('@icsp_ignore')).to eq(true)
     end
   end
 end

data/spec/unit/oneview_login_spec.rb

@@ -12,12 +12,6 @@ RSpec.describe Chef::Provisioning::OneViewDriver do
     it 'can parse the icsp sessionID' do
       expect(@instance.instance_eval { login_to_icsp }).to match(@icsp_key)
     end
-
-    it 'gets both auth tokens via the auth_tokens method' do
-      @instance.instance_eval { auth_tokens }
-      expect(@instance.instance_variable_get('@oneview_key')).to match(@oneview_key)
-      expect(@instance.instance_variable_get('@icsp_key')).to match(@icsp_key)
-    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-oneview
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Hewlett Packard Enterprise
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: ridley
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +110,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.40.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.40.0
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Chef Provisioning driver for OneView