bosh_openstack_cpi 1.2690.4.0 → 1.2693.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/cloud/openstack/cloud.rb +7 -3
  3. data/lib/cloud/openstack/excon_logging_instrumentor.rb +3 -0
  4. data/lib/cloud/openstack/version.rb +1 -1
  5. metadata +9 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d82d87b81ee8ddbac327893ca97cf5c1bec0e44a
4
- data.tar.gz: 3b3cddd16eb9137487edee9e86bdfc0d07f4dbb6
3
+ metadata.gz: 361171741ab4162ca5f8f25d945876b86423a4f4
4
+ data.tar.gz: 7b2c0e630bfa35533b8ab5d4ec7f5b9821035acb
5
5
  SHA512:
6
- metadata.gz: c76d1e3618d4cdb21611c0df8d3bc444127297dc6d1f703f0cc187dd3f5328262e29405a27281cbc50020102fdfb436b87c35cd8486f7758e017d5838cc01094
7
- data.tar.gz: b379aee5e2c1590599cd9ed9a70cd68adb113990526d826edc92ea31477bddef174a804e879c66c5d867db29cb9225ff37ff44e6e2419875d9ce52cd4c5ea914
6
+ metadata.gz: e1213f3b2594f88b273f858e39ae1ac0cf6a6c56236c00f2e74caeb72864fe285f02981e95b903eda372ba47a85871608b4ba4743a8887a09c421e8347a21cb6
7
+ data.tar.gz: 9e4f1a45bd4370b6ee52f316f0d78e05a774a3d3ae8e9a7ca0b9109b5886ff349464f7f138c27e83825c9d190d938e24e01d552107f0c34662d59b9665e9ab7a
data/lib/cloud/openstack/cloud.rb CHANGED
@@ -45,6 +45,10 @@ module Bosh::OpenStackCloud
45
45
  @openstack_properties['auth_url'] = @openstack_properties['auth_url'] + '/tokens'
46
46
  end
47
47
 
48
+ @openstack_properties['connection_options'] ||= {}
49
+
50
+ extra_connection_options = {'instrumentor' => Bosh::OpenStackCloud::ExconLoggingInstrumentor}
51
+
48
52
  openstack_params = {
49
53
  :provider => 'OpenStack',
50
54
  :openstack_auth_url => @openstack_properties['auth_url'],
@@ -53,7 +57,7 @@ module Bosh::OpenStackCloud
53
57
  :openstack_tenant => @openstack_properties['tenant'],
54
58
  :openstack_region => @openstack_properties['region'],
55
59
  :openstack_endpoint_type => @openstack_properties['endpoint_type'],
56
- :connection_options => @openstack_properties['connection_options']
60
+ :connection_options => @openstack_properties['connection_options'].merge(extra_connection_options)
57
61
  }
58
62
  begin
59
63
  @openstack = Fog::Compute.new(openstack_params)
@@ -70,7 +74,7 @@ module Bosh::OpenStackCloud
70
74
  :openstack_tenant => @openstack_properties['tenant'],
71
75
  :openstack_region => @openstack_properties['region'],
72
76
  :openstack_endpoint_type => @openstack_properties['endpoint_type'],
73
- :connection_options => @openstack_properties['connection_options']
77
+ :connection_options => @openstack_properties['connection_options'].merge(extra_connection_options)
74
78
  }
75
79
  begin
76
80
  @glance = Fog::Image.new(glance_params)
@@ -86,7 +90,7 @@ module Bosh::OpenStackCloud
86
90
  :openstack_api_key => @openstack_properties["api_key"],
87
91
  :openstack_tenant => @openstack_properties["tenant"],
88
92
  :openstack_endpoint_type => @openstack_properties["endpoint_type"],
89
- :connection_options => @openstack_properties['connection_options']
93
+ :connection_options => @openstack_properties['connection_options'].merge(extra_connection_options)
90
94
  }
91
95
  begin
92
96
  @volume = Fog::Volume.new(volume_params)
data/lib/cloud/openstack/excon_logging_instrumentor.rb CHANGED
@@ -3,6 +3,9 @@ module Bosh::OpenStackCloud
3
3
  def self.instrument(name, params = {}, &block)
4
4
  params = Bosh::OpenStackCloud::RedactedParams.new(params)
5
5
  Bosh::Clouds::Config.logger.debug("#{name} #{params}")
6
+ cpi_logger = Logger.new(Bosh::Clouds::Config.cpi_task_log)
7
+ cpi_logger.debug("#{name} #{params}")
8
+ cpi_logger.close
6
9
  if block_given?
7
10
  yield
8
11
  end
data/lib/cloud/openstack/version.rb CHANGED
@@ -3,6 +3,6 @@
3
3
 
4
4
  module Bosh
5
5
  module OpenStackCloud
6
- VERSION = '1.2690.4.0'
6
+ VERSION = '1.2693.0'
7
7
  end
8
8
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh_openstack_cpi
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2690.4.0
4
+ version: 1.2693.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Piston Cloud Computing / VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-02 00:00:00.000000000 Z
11
+ date: 2014-08-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fog
@@ -30,42 +30,42 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.2690.4.0
33
+ version: 1.2693.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.2690.4.0
40
+ version: 1.2693.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bosh_cpi
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.2690.4.0
47
+ version: 1.2693.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 1.2690.4.0
54
+ version: 1.2693.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bosh-registry
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.2690.4.0
61
+ version: 1.2693.0
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 1.2690.4.0
68
+ version: 1.2693.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: httpclient
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
96
96
  version: 0.8.2
97
97
  description: |-
98
98
  BOSH OpenStack CPI
99
- f9637b
99
+ 193a56
100
100
  email: support@cloudfoundry.com
101
101
  executables:
102
102
  - bosh_openstack_console