torpedo 1.0.14 → 1.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/CHANGELOG +3 -0
  2. data/VERSION +1 -1
  3. data/lib/torpedo/compute/helper.rb +6 -1
  4. metadata +4 -4
data/CHANGELOG CHANGED
@@ -1,3 +1,6 @@
1
+ * Fri Mar 16 2012 Dan Prince <dprince@redhat.com> - 1.0.15
2
+ -Set auth_method = 'rax-kskey' if NOVA_RAX_AUTH is set.
3
+
1
4
  * Fri Feb 24 2012 Dan Prince <dprince@redhat.com> - 1.0.14
2
5
  -Update OS_ variables to match Openstack standard.
3
6
  OS_AUTH_KEY is now OS_PASSWORD
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.0.14
1
+ 1.0.15
data/lib/torpedo/compute/helper.rb CHANGED
@@ -17,13 +17,18 @@ module Helper
17
17
  debug = true
18
18
  end
19
19
 
20
+ auth_method = 'password'
21
+ if ENV['NOVA_RAX_AUTH'] and ENV['NOVA_RAX_AUTH'] == '1' then
22
+ auth_method = 'rax-kskey'
23
+ end
24
+
20
25
  auth_url = ENV['NOVA_URL'] || ENV['OS_AUTH_URL']
21
26
  api_key = ENV['NOVA_API_KEY'] || ENV['OS_PASSWORD']
22
27
  username = ENV['NOVA_USERNAME'] || ENV['OS_USERNAME']
23
28
  authtenant = ENV['NOVA_PROJECT_ID'] || ENV['OS_TENANT_NAME']
24
29
  region = ENV['NOVA_REGION_NAME'] || ENV['OS_AUTH_REGION']
25
30
 
26
- OpenStack::Compute::Connection.new(:username => username, :api_key => api_key, :auth_url => auth_url, :region => region, :authtenant => authtenant, :is_debug => debug)
31
+ OpenStack::Compute::Connection.new(:username => username, :api_key => api_key, :auth_url => auth_url, :region => region, :authtenant => authtenant, :is_debug => debug, :auth_method => auth_method)
27
32
  end
28
33
 
29
34
  def self.get_image_ref(conn)
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: torpedo
3
3
  version: !ruby/object:Gem::Version
4
- hash: 11
4
+ hash: 9
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 0
9
- - 14
10
- version: 1.0.14
9
+ - 15
10
+ version: 1.0.15
11
11
  platform: ruby
12
12
  authors:
13
13
  - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-02-25 00:00:00 Z
18
+ date: 2012-03-16 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  requirement: &id001 !ruby/object:Gem::Requirement