bosh_openstack_cpi 1.2291.0 → 1.2311.0

data/lib/cloud/openstack.rb

@@ -30,6 +30,8 @@ require "cloud/openstack/network"
 require "cloud/openstack/dynamic_network"
 require "cloud/openstack/manual_network"
 require "cloud/openstack/vip_network"
+require "cloud/openstack/excon_logging_instrumentor"
+require "cloud/openstack/redacted_params"
 
 module Bosh
   module Clouds

data/lib/cloud/openstack/cloud.rb

@@ -56,7 +56,7 @@ module Bosh::OpenStackCloud
         @openstack = Fog::Compute.new(openstack_params)
       rescue Exception => e
         @logger.error(e)
-        cloud_error("Unable to connect to the OpenStack Compute API. Check task debug log for details.")  
+        cloud_error("Unable to connect to the OpenStack Compute API. Check task debug log for details.")
       end
 
       glance_params = {
@@ -106,15 +106,15 @@ module Bosh::OpenStackCloud
               :container_format => cloud_properties["container_format"],
               :is_public => @stemcell_public_visibility.nil? ? false : @stemcell_public_visibility,
             }
-            
+
             image_properties = {}
             vanilla_options = ["name", "version", "os_type", "os_distro", "architecture", "auto_disk_config"]
             vanilla_options.reject{ |o| cloud_properties[o].nil? }.each do |key|
               image_properties[key.to_sym] = cloud_properties[key]
-            end            
+            end
             image_params[:properties] = image_properties unless image_properties.empty?
-            
-            # If image_location is set in cloud properties, then pass the copy-from parm. Then Glance will fetch it 
+
+            # If image_location is set in cloud properties, then pass the copy-from parm. Then Glance will fetch it
             # from the remote location on a background job and store it in its repository.
             # Otherwise, unpack image to temp directory and upload to Glance the root image.
             if cloud_properties["image_location"]
@@ -126,13 +126,13 @@ module Bosh::OpenStackCloud
               image_params[:location] = File.join(tmp_dir, "root.img")
             end
 
-            # Upload image using Glance service            
+            # Upload image using Glance service
             @logger.debug("Using image parms: `#{image_params.inspect}'")
             image = with_openstack { @glance.images.create(image_params) }
-            
+
             @logger.info("Creating new image `#{image.id}'...")
             wait_resource(image, :active)
-            
+
             image.id.to_s
           end
         rescue => e
@@ -330,7 +330,7 @@ module Bosh::OpenStackCloud
         compare_security_groups(server, network_configurator.security_groups(@default_security_groups))
 
         compare_private_ip_addresses(server, network_configurator.private_ip)
-        
+
         network_configurator.configure(@openstack, server)
 
         update_agent_settings(server) do |settings|
@@ -461,7 +461,7 @@ module Bosh::OpenStackCloud
 
         devices = []
         volume.attachments.each { |attachment| devices << attachment["device"] unless attachment.empty? }
-       
+
         description = [:deployment, :job, :index].collect { |key| metadata[key] }
         description << devices.first.split('/').last unless devices.empty?
         snapshot_params = {
@@ -613,12 +613,12 @@ module Bosh::OpenStackCloud
     end
 
     ##
-    # Generates initial agent settings. These settings will be read by Bosh Agent from Bosh Registry on a target 
+    # Generates initial agent settings. These settings will be read by Bosh Agent from Bosh Registry on a target
     # server. Disk conventions in Bosh Agent for OpenStack are:
     # - system disk: /dev/sda
     # - ephemeral disk: /dev/sdb
     # - persistent disks: /dev/sdc through /dev/sdz
-    # As some kernels remap device names (from sd* to vd* or xvd*), Bosh Agent will lookup for the proper device name 
+    # As some kernels remap device names (from sd* to vd* or xvd*), Bosh Agent will lookup for the proper device name
     #
     # @param [String] server_name Name of the OpenStack server (will be picked
     #   up by agent to fetch registry settings)
@@ -692,13 +692,13 @@ module Bosh::OpenStackCloud
       volume_attachments = with_openstack { server.volume_attachments }
       device = volume_attachments.find { |a| a["volumeId"] == volume.id }
 
-      if device.nil?                
+      if device.nil?
         device_name = select_device_name(volume_attachments, first_device_name_letter(server))
         cloud_error("Server has too many disks attached") if device_name.nil?
 
         @logger.info("Attaching volume `#{volume.id}' to server `#{server.id}', device name is `#{device_name}'")
         with_openstack { volume.attach(server.id, device_name) }
-        wait_resource(volume, :"in-use")        
+        wait_resource(volume, :"in-use")
       else
         device_name = device["device"]
         @logger.info("Volume `#{volume.id}' is already attached to server `#{server.id}' in `#{device_name}'. Skipping.")
@@ -715,7 +715,7 @@ module Bosh::OpenStackCloud
     # @return [String] First available device name or nil is none is available
     def select_device_name(volume_attachments, first_device_name_letter)
       (first_device_name_letter.."z").each do |char|
-        # Some kernels remap device names (from sd* to vd* or xvd*). 
+        # Some kernels remap device names (from sd* to vd* or xvd*).
         device_names = ["/dev/sd#{char}", "/dev/vd#{char}", "/dev/xvd#{char}"]
         # Bosh Agent will lookup for the proper device name if we set it initially to sd*.
         return "/dev/sd#{char}" if volume_attachments.select { |v| device_names.include?( v["device"]) }.empty?
@@ -765,7 +765,7 @@ module Bosh::OpenStackCloud
     # @param [Fog::Compute::OpenStack::Server] server OpenStack server
     # @param [Array] specified_sg_names Security groups specified at the network spec
     # @return [void]
-    # @raise [Bosh::Clouds:NotSupported] If the security groups change, we need to recreate the VM as you can't 
+    # @raise [Bosh::Clouds:NotSupported] If the security groups change, we need to recreate the VM as you can't
     # change the security group of a running server, so we need to send the InstanceUpdater a request to do it for us
     def compare_security_groups(server, specified_sg_names)
       actual_sg_names = with_openstack { server.security_groups }.collect { |sg| sg.name }
@@ -783,7 +783,7 @@ module Bosh::OpenStackCloud
     # @param [Fog::Compute::OpenStack::Server] server OpenStack server
     # @param [String] specified_ip_address IP address specified at the network spec (if Manual network)
     # @return [void]
-    # @raise [Bosh::Clouds:NotSupported] If the IP address change, we need to recreate the VM as you can't 
+    # @raise [Bosh::Clouds:NotSupported] If the IP address change, we need to recreate the VM as you can't
     # change the IP address of a running server, so we need to send the InstanceUpdater a request to do it for us
     def compare_private_ip_addresses(server, specified_ip_address)
       actual_ip_addresses = with_openstack { server.private_ip_addresses }

data/lib/cloud/openstack/excon_logging_instrumentor.rb

@@ -0,0 +1,11 @@
+module Bosh::OpenStackCloud
+  class ExconLoggingInstrumentor
+    def self.instrument(name, params = {}, &block)
+      params = Bosh::OpenStackCloud::RedactedParams.new(params)
+      Bosh::Clouds::Config.logger.debug("#{name} #{params}")
+      if block_given?
+        yield
+      end
+    end
+  end
+end

data/lib/cloud/openstack/redacted_params.rb

@@ -0,0 +1,29 @@
+module Bosh::OpenStackCloud
+  class RedactedParams
+    REDACTED = "[REDACTED]"
+
+    def initialize(params)
+      @params = params
+      redact_authorization_params
+      redact_password_params
+    end
+
+    def to_s
+      @params.inspect
+    end
+
+    private
+
+    def redact_authorization_params
+      if @params.has_key?(:headers) && @params[:headers].has_key?('Authorization')
+        @params[:headers]['Authorization'] = REDACTED
+      end
+    end
+
+    def redact_password_params
+      if @params.has_key?(:password)
+        @params[:password] = REDACTED
+      end
+    end
+  end
+end

data/lib/cloud/openstack/version.rb

@@ -3,6 +3,6 @@
 
 module Bosh
   module OpenStackCloud
-    VERSION = '1.2291.0'
+    VERSION = '1.2311.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_openstack_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2291.0
+  version: 1.2311.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2291.0
+        version: 1.2311.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2291.0
+        version: 1.2311.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2291.0
+        version: 1.2311.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2291.0
+        version: 1.2311.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2291.0
+        version: 1.2311.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2291.0
+        version: 1.2311.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: 0.8.2
 description: ! 'BOSH OpenStack CPI
 
-  51a1bb'
+  7df356'
 email: support@cloudfoundry.com
 executables:
 - bosh_openstack_console
@@ -121,10 +121,12 @@ files:
 - lib/cloud/openstack.rb
 - lib/cloud/openstack/cloud.rb
 - lib/cloud/openstack/dynamic_network.rb
+- lib/cloud/openstack/excon_logging_instrumentor.rb
 - lib/cloud/openstack/helpers.rb
 - lib/cloud/openstack/manual_network.rb
 - lib/cloud/openstack/network.rb
 - lib/cloud/openstack/network_configurator.rb
+- lib/cloud/openstack/redacted_params.rb
 - lib/cloud/openstack/tag_manager.rb
 - lib/cloud/openstack/version.rb
 - lib/cloud/openstack/vip_network.rb
@@ -151,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1037434515704413152
+      hash: -1396145754885881155
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23