chef-provisioning-oneview 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c3667ee64a73be8e4461ef96c4809810bea95e8
-  data.tar.gz: b1e38d4a95c2b93d25c665cec20e1ec9080557bc
+  metadata.gz: 0ae15bf94209328a9129b9e9f3c8675353489446
+  data.tar.gz: bbe18ef476706f98e3765105cf9a96e6c6bcc032
 SHA512:
-  metadata.gz: 9cf35136389e6bb5dcffced8755ae54929f7bb35e9cea7d6501ed9d5ef1f457640e31d5cb6f6d831d7b859c6947a28118f2f856142884b539b73c04ad57e4c2d
-  data.tar.gz: 421361c479b72770676bd397e8591fe979c4d8b809813233522b059b01ab538dfa6e081b956ed67d229e3fbd1465b7b46c9b6601f877296d5456b04fba74d355
+  metadata.gz: c1c10f4e7d47d50e99e5d74240bb593c4d5e8209c33e051804098b9f997ec8c1e10426072815fed61f28cf42a98688c3077bd3d22440347124a7e5910ea47fea
+  data.tar.gz: d2779ba0f8a05316bd812c3860091b00e06cf467fcf9f83b2c633fb41959112cb0642e09e728800905d1c74eb906e8f8ec87854451a2c858fb1126ae2e594d0e

data/README.md

@@ -94,6 +94,7 @@ machine 'web01' do
           :dns => :none             # Optional. Overrides dns property above
         }
       },
+      :skip_network_configuration => false, # Default. Set to true for EXSi hosts, etc.
       :custom_attributes => {
         :chefCert => 'ssh-rsa AA...' # Optional
       }

data/lib/chef/provisioning/icsp/icsp_api.rb

@@ -34,11 +34,11 @@ module ICspAPI
     fail("\nERROR! Couldn't log into OneView server at #{@oneview_base_url}. Response:\n#{response}")
   end
 
-  def get_icsp_server_by_sn(serialNumber)
-    fail 'Must specify a serialNumber!' if serialNumber.nil? || serialNumber.empty?
+  def get_icsp_server_by_sn(serial_number)
+    fail 'Must specify a serialNumber!' if serial_number.nil? || serial_number.empty?
     search_result = rest_api(:icsp, :get,
-      "/rest/index/resources?category=osdserver&query='osdServerSerialNumber:\"#{serialNumber}\"'")['members'] rescue nil
-    if search_result && search_result.size == 1 && search_result.first['attributes']['osdServerSerialNumber'] == serialNumber
+      "/rest/index/resources?category=osdserver&query='osdServerSerialNumber:\"#{serial_number}\"'")['members'] rescue nil
+    if search_result && search_result.size == 1 && search_result.first['attributes']['osdServerSerialNumber'] == serial_number
       my_server_uri = search_result.first['uri']
       my_server = rest_api(:icsp, :get, my_server_uri)
     end
@@ -47,7 +47,7 @@ module ICspAPI
       # Pick the relevant os deployment server from icsp
       my_server = nil
       os_deployment_servers['members'].each do |server|
-        if server['serialNumber'] == serialNumber
+        if server['serialNumber'] == serial_number
           my_server = server
           break
         end
@@ -154,6 +154,7 @@ module ICspAPI
   end
 
   def icsp_configure_networking(action_handler, machine_spec, machine_options, my_server, profile)
+    return if machine_options[:driver_options][:skip_network_configuration] == true
     action_handler.perform_action "Configure networking on #{machine_spec.name}" do
       action_handler.report_progress "INFO: Configuring networking on #{machine_spec.name}"
       personality_data = icsp_build_personality_data(machine_options, profile)

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

@@ -36,10 +36,10 @@ module OneViewAPI
     fail("\nERROR! Couldn't log into OneView server at #{@oneview_base_url}. Response:\n#{response}")
   end
 
-  def get_oneview_profile_by_sn(serialNumber)
-    fail 'Must specify a serialNumber!' if serialNumber.nil? || serialNumber.empty?
-    matching_profiles = rest_api(:oneview, :get, "/rest/server-profiles?filter=serialNumber matches '#{serialNumber}'&sort=name:asc")
-    fail "Failed to get oneview profile by serialNumber: #{serialNumber}. Response: #{matching_profiles}" unless matching_profiles['count']
+  def get_oneview_profile_by_sn(serial_number)
+    fail 'Must specify a serialNumber!' if serial_number.nil? || serial_number.empty?
+    matching_profiles = rest_api(:oneview, :get, "/rest/server-profiles?filter=serialNumber matches '#{serial_number}'&sort=name:asc")
+    fail "Failed to get oneview profile by serialNumber: #{serial_number}. Response: #{matching_profiles}" unless matching_profiles['count']
     return matching_profiles['members'].first if matching_profiles['count'] > 0
     nil
   end

data/lib/chef/provisioning/version.rb

@@ -1,5 +1,5 @@
 class Chef
   module Provisioning
-    ONEVIEW_DRIVER_VERSION = '1.1.0'
+    ONEVIEW_DRIVER_VERSION = '1.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-oneview
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Hewlett Packard Enterprise
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef