torpedo 1.0.15 → 1.0.16
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.
- data/CHANGELOG +4 -0
- data/VERSION +1 -1
- data/lib/torpedo/compute/helper.rb +14 -1
- metadata +4 -4
data/CHANGELOG
CHANGED
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
* Mon Apr 2 2012 Dan Prince <dprince@redhat.com> - 1.0.16
|
|
2
|
+
-Add NOVA_SERVICE_NAME env setting (defaults is nil)
|
|
3
|
+
-Add NOVA_SERVICE_TYPE env setting (default is 'compute')
|
|
4
|
+
|
|
1
5
|
* Fri Mar 16 2012 Dan Prince <dprince@redhat.com> - 1.0.15
|
|
2
6
|
-Set auth_method = 'rax-kskey' if NOVA_RAX_AUTH is set.
|
|
3
7
|
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.0.
|
|
1
|
+
1.0.16
|
|
@@ -27,8 +27,21 @@ module Helper
|
|
|
27
27
|
username = ENV['NOVA_USERNAME'] || ENV['OS_USERNAME']
|
|
28
28
|
authtenant = ENV['NOVA_PROJECT_ID'] || ENV['OS_TENANT_NAME']
|
|
29
29
|
region = ENV['NOVA_REGION_NAME'] || ENV['OS_AUTH_REGION']
|
|
30
|
+
service_type = ENV['NOVA_SERVICE_TYPE'] || "compute"
|
|
31
|
+
service_name = ENV['NOVA_SERVICE_NAME'] #nil by default
|
|
32
|
+
|
|
33
|
+
OpenStack::Compute::Connection.new(
|
|
34
|
+
:username => username,
|
|
35
|
+
:api_key => api_key,
|
|
36
|
+
:auth_url => auth_url,
|
|
37
|
+
:region => region,
|
|
38
|
+
:authtenant => authtenant,
|
|
39
|
+
:is_debug => debug,
|
|
40
|
+
:auth_method => auth_method,
|
|
41
|
+
:service_name => service_name,
|
|
42
|
+
:service_type => service_type
|
|
43
|
+
)
|
|
30
44
|
|
|
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)
|
|
32
45
|
end
|
|
33
46
|
|
|
34
47
|
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:
|
|
4
|
+
hash: 55
|
|
5
5
|
prerelease:
|
|
6
6
|
segments:
|
|
7
7
|
- 1
|
|
8
8
|
- 0
|
|
9
|
-
-
|
|
10
|
-
version: 1.0.
|
|
9
|
+
- 16
|
|
10
|
+
version: 1.0.16
|
|
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-
|
|
18
|
+
date: 2012-04-02 00:00:00 Z
|
|
19
19
|
dependencies:
|
|
20
20
|
- !ruby/object:Gem::Dependency
|
|
21
21
|
requirement: &id001 !ruby/object:Gem::Requirement
|