knife-rackspace 0.9.0 → 0.9.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG.md +6 -0
- data/lib/chef/knife/rackspace_base.rb +2 -2
- data/lib/chef/knife/rackspace_flavor_list.rb +0 -2
- data/lib/chef/knife/rackspace_server_create.rb +7 -0
- data/lib/knife-rackspace/version.rb +1 -1
- data/spec/cassettes/v1/should_list_images.yml +24 -24
- data/spec/cassettes/v1/should_list_server_flavors.yml +184 -184
- data/spec/cassettes/v2/should_list_images.yml +293 -168
- data/spec/cassettes/v2/should_list_server_flavors.yml +72 -72
- metadata +21 -5
- checksums.yaml +0 -15
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## v0.9.1
|
|
2
|
+
* KNIFE-460 Remove extraneous flavor reloads
|
|
3
|
+
* KNIFE-459 Add support for config-drive
|
|
4
|
+
* KNIFE-440 fix two minor typos in the ui.error message
|
|
5
|
+
* use {public_ip_address}.xip.io instead of {public_ip_address}.rs-cloud.xip.io
|
|
6
|
+
|
|
1
7
|
## v0.9.0
|
|
2
8
|
* KNIFE-398 support secret/secret_file in knife.rb
|
|
3
9
|
* KNIFE-420 Add --ssh-keypair for using ssh keys already registered with nova.
|
|
@@ -112,7 +112,7 @@ class Chef
|
|
|
112
112
|
|
|
113
113
|
def connection_params(options={})
|
|
114
114
|
unless locate_config_value(:rackspace_region)
|
|
115
|
-
ui.error "Please specify region via the command line using the --
|
|
115
|
+
ui.error "Please specify region via the command line using the --rackspace-region switch or add a knife[:rackspace_region] = REGION to your knife file."
|
|
116
116
|
exit 1
|
|
117
117
|
end
|
|
118
118
|
|
|
@@ -175,7 +175,7 @@ class Chef
|
|
|
175
175
|
@public_dns_name ||= begin
|
|
176
176
|
Resolv.getname(public_ip_address)
|
|
177
177
|
rescue
|
|
178
|
-
"#{public_ip_address}.
|
|
178
|
+
"#{public_ip_address}.xip.io"
|
|
179
179
|
end
|
|
180
180
|
end
|
|
181
181
|
end
|
|
@@ -203,6 +203,12 @@ class Chef
|
|
|
203
203
|
:proc => Proc.new { |k| Chef::Config[:knife][:rackspace_disk_config] = k },
|
|
204
204
|
:default => "AUTO"
|
|
205
205
|
|
|
206
|
+
option :rackspace_config_drive,
|
|
207
|
+
:long => "--rackspace_config_drive CONFIGDRIVE",
|
|
208
|
+
:description => "Creates a config drive device in /dev/disk/by-label/config-2 if set to TRUE",
|
|
209
|
+
:proc => Proc.new { |k| Chef::Config[:knife][:rackspace_config_drive] = k },
|
|
210
|
+
:default => "false"
|
|
211
|
+
|
|
206
212
|
option :ssh_keypair,
|
|
207
213
|
:long => "--ssh-keypair KEYPAIR_NAME",
|
|
208
214
|
:description => "Name of existing nova SSH keypair. Public key will be injected into the instance.",
|
|
@@ -330,6 +336,7 @@ class Chef
|
|
|
330
336
|
:flavor_id => locate_config_value(:flavor),
|
|
331
337
|
:metadata => Chef::Config[:knife][:rackspace_metadata],
|
|
332
338
|
:disk_config => Chef::Config[:knife][:rackspace_disk_config],
|
|
339
|
+
:config_drive => locate_config_value(:rackspace_config_drive) || false,
|
|
333
340
|
:personality => files,
|
|
334
341
|
:keypair => Chef::Config[:knife][:rackspace_ssh_keypair]
|
|
335
342
|
)
|
|
@@ -8,7 +8,7 @@ http_interactions:
|
|
|
8
8
|
string: ''
|
|
9
9
|
headers:
|
|
10
10
|
User-Agent:
|
|
11
|
-
- fog/1.
|
|
11
|
+
- fog/1.19.0
|
|
12
12
|
Content-Type:
|
|
13
13
|
- application/json
|
|
14
14
|
Accept:
|
|
@@ -19,29 +19,29 @@ http_interactions:
|
|
|
19
19
|
code: 200
|
|
20
20
|
message:
|
|
21
21
|
headers:
|
|
22
|
-
|
|
23
|
-
-
|
|
22
|
+
Server:
|
|
23
|
+
- Jetty(8.0.y.z-SNAPSHOT)
|
|
24
|
+
X-Varnish: _VARNISH-REQUEST-ID_
|
|
25
|
+
Vary:
|
|
26
|
+
- Accept-Encoding, Accept, Accept-Encoding, X-Auth-Token
|
|
24
27
|
Cache-Control:
|
|
25
28
|
- s-maxage=1800
|
|
29
|
+
Content-Type:
|
|
30
|
+
- application/json
|
|
31
|
+
x-purge-key:
|
|
32
|
+
- /000000/images
|
|
33
|
+
Date:
|
|
34
|
+
- Fri, 17 Jan 2014 19:13:27 GMT
|
|
26
35
|
Via:
|
|
27
36
|
- 1.1 Repose (Repose/2.11.0), 1.1 varnish
|
|
37
|
+
Connection:
|
|
38
|
+
- close
|
|
28
39
|
Last-Modified:
|
|
29
40
|
- Mon, 09 Jul 2012 17:15:23 GMT
|
|
30
|
-
x-purge-key:
|
|
31
|
-
- /000000/images
|
|
32
|
-
Vary:
|
|
33
|
-
- Accept-Encoding, Accept, Accept-Encoding, X-Auth-Token
|
|
34
|
-
Server:
|
|
35
|
-
- Jetty(8.0.y.z-SNAPSHOT)
|
|
36
|
-
Content-Length:
|
|
37
|
-
- '2547'
|
|
38
|
-
Date:
|
|
39
|
-
- Fri, 17 Jan 2014 17:22:13 GMT
|
|
40
|
-
X-Varnish: _VARNISH-REQUEST-ID_
|
|
41
41
|
Age:
|
|
42
42
|
- '0'
|
|
43
|
-
|
|
44
|
-
-
|
|
43
|
+
Content-Length:
|
|
44
|
+
- '2547'
|
|
45
45
|
body:
|
|
46
46
|
encoding: US-ASCII
|
|
47
47
|
string: ! '{"images":[{"id":118,"status":"ACTIVE","updated":"2011-08-17T05:11:30-05:00","name":"CentOS
|
|
@@ -71,7 +71,7 @@ http_interactions:
|
|
|
71
71
|
5.8"},{"id":89,"status":"ACTIVE","updated":"2011-10-04T08:39:34-05:00","name":"Windows
|
|
72
72
|
Server 2008 R2 x64 + SQL Server 2008 R2 Web"}]}'
|
|
73
73
|
http_version:
|
|
74
|
-
recorded_at: Fri, 17 Jan 2014
|
|
74
|
+
recorded_at: Fri, 17 Jan 2014 19:13:27 GMT
|
|
75
75
|
- request:
|
|
76
76
|
method: post
|
|
77
77
|
uri: https://identity.api.rackspacecloud.com/v2.0/tokens
|
|
@@ -80,7 +80,7 @@ http_interactions:
|
|
|
80
80
|
string: ! '{"auth":{"RAX-KSKEY:apiKeyCredentials":{"username":"_RAX_USERNAME_","apiKey":"_RAX_PASSWORD_"}}}'
|
|
81
81
|
headers:
|
|
82
82
|
User-Agent:
|
|
83
|
-
- fog/1.
|
|
83
|
+
- fog/1.20.0
|
|
84
84
|
Content-Type:
|
|
85
85
|
- application/json
|
|
86
86
|
Accept:
|
|
@@ -94,7 +94,7 @@ http_interactions:
|
|
|
94
94
|
Server:
|
|
95
95
|
- nginx/0.8.55
|
|
96
96
|
Date:
|
|
97
|
-
-
|
|
97
|
+
- Tue, 04 Mar 2014 21:23:43 GMT
|
|
98
98
|
Content-Type:
|
|
99
99
|
- application/json
|
|
100
100
|
Transfer-Encoding:
|
|
@@ -109,13 +109,13 @@ http_interactions:
|
|
|
109
109
|
- 'on'
|
|
110
110
|
body:
|
|
111
111
|
encoding: US-ASCII
|
|
112
|
-
string: ! '{"access":{"token":{"id":"
|
|
112
|
+
string: ! '{"access":{"token":{"id":"_ONE-TIME-TOKEN_","expires":"2014-03-05T06:42:51.029Z","tenant":{"id":"000000","name":"000000"},"RAX-AUTH:authenticatedBy":["APIKEY"]},"serviceCatalog":[{"name":"cloudFiles","endpoints":[{"region":"DFW","tenantId":"_CDN-TENANT-NAME_","publicURL":"https:\/\/storage101.dfw1.clouddrive.com\/v1\/_CDN-TENANT-NAME_","internalURL":"https:\/\/snet-storage101.dfw1.clouddrive.com\/v1\/_CDN-TENANT-NAME_"},{"region":"ORD","tenantId":"_CDN-TENANT-NAME_","publicURL":"https:\/\/storage101.ord1.clouddrive.com\/v1\/_CDN-TENANT-NAME_","internalURL":"https:\/\/snet-storage101.ord1.clouddrive.com\/v1\/_CDN-TENANT-NAME_"},{"region":"SYD","tenantId":"_CDN-TENANT-NAME_","publicURL":"https:\/\/storage101.syd2.clouddrive.com\/v1\/_CDN-TENANT-NAME_","internalURL":"https:\/\/snet-storage101.syd2.clouddrive.com\/v1\/_CDN-TENANT-NAME_"},{"region":"IAD","tenantId":"_CDN-TENANT-NAME_","publicURL":"https:\/\/storage101.iad3.clouddrive.com\/v1\/_CDN-TENANT-NAME_","internalURL":"https:\/\/snet-storage101.iad3.clouddrive.com\/v1\/_CDN-TENANT-NAME_"},{"region":"HKG","tenantId":"_CDN-TENANT-NAME_","publicURL":"https:\/\/storage101.hkg1.clouddrive.com\/v1\/_CDN-TENANT-NAME_","internalURL":"https:\/\/snet-storage101.hkg1.clouddrive.com\/v1\/_CDN-TENANT-NAME_"}],"type":"object-store"},{"name":"cloudFilesCDN","endpoints":[{"region":"DFW","tenantId":"_CDN-TENANT-NAME_","publicURL":"https:\/\/cdn1.clouddrive.com\/v1\/_CDN-TENANT-NAME_"},{"region":"ORD","tenantId":"_CDN-TENANT-NAME_","publicURL":"https:\/\/cdn2.clouddrive.com\/v1\/_CDN-TENANT-NAME_"},{"region":"SYD","tenantId":"_CDN-TENANT-NAME_","publicURL":"https:\/\/cdn4.clouddrive.com\/v1\/_CDN-TENANT-NAME_"},{"region":"IAD","tenantId":"_CDN-TENANT-NAME_","publicURL":"https:\/\/cdn5.clouddrive.com\/v1\/_CDN-TENANT-NAME_"},{"region":"HKG","tenantId":"_CDN-TENANT-NAME_","publicURL":"https:\/\/cdn6.clouddrive.com\/v1\/_CDN-TENANT-NAME_"}],"type":"rax:object-cdn"},{"name":"cloudBlockStorage","endpoints":[{"region":"SYD","tenantId":"000000","publicURL":"https:\/\/syd.blockstorage.api.rackspacecloud.com\/v1\/000000"},{"region":"ORD","tenantId":"000000","publicURL":"https:\/\/ord.blockstorage.api.rackspacecloud.com\/v1\/000000"},{"region":"DFW","tenantId":"000000","publicURL":"https:\/\/dfw.blockstorage.api.rackspacecloud.com\/v1\/000000"},{"region":"IAD","tenantId":"000000","publicURL":"https:\/\/iad.blockstorage.api.rackspacecloud.com\/v1\/000000"},{"region":"HKG","tenantId":"000000","publicURL":"https:\/\/hkg.blockstorage.api.rackspacecloud.com\/v1\/000000"}],"type":"volume"},{"name":"cloudDatabases","endpoints":[{"region":"SYD","tenantId":"000000","publicURL":"https:\/\/syd.databases.api.rackspacecloud.com\/v1.0\/000000"},{"region":"DFW","tenantId":"000000","publicURL":"https:\/\/dfw.databases.api.rackspacecloud.com\/v1.0\/000000"},{"region":"ORD","tenantId":"000000","publicURL":"https:\/\/ord.databases.api.rackspacecloud.com\/v1.0\/000000"},{"region":"IAD","tenantId":"000000","publicURL":"https:\/\/iad.databases.api.rackspacecloud.com\/v1.0\/000000"},{"region":"HKG","tenantId":"000000","publicURL":"https:\/\/hkg.databases.api.rackspacecloud.com\/v1.0\/000000"}],"type":"rax:database"},{"name":"cloudLoadBalancers","endpoints":[{"region":"SYD","tenantId":"000000","publicURL":"https:\/\/syd.loadbalancers.api.rackspacecloud.com\/v1.0\/000000"},{"region":"ORD","tenantId":"000000","publicURL":"https:\/\/ord.loadbalancers.api.rackspacecloud.com\/v1.0\/000000"},{"region":"DFW","tenantId":"000000","publicURL":"https:\/\/dfw.loadbalancers.api.rackspacecloud.com\/v1.0\/000000"},{"region":"IAD","tenantId":"000000","publicURL":"https:\/\/iad.loadbalancers.api.rackspacecloud.com\/v1.0\/000000"},{"region":"HKG","tenantId":"000000","publicURL":"https:\/\/hkg.loadbalancers.api.rackspacecloud.com\/v1.0\/000000"}],"type":"rax:load-balancer"},{"name":"cloudServersOpenStack","endpoints":[{"region":"SYD","tenantId":"000000","publicURL":"https:\/\/syd.servers.api.rackspacecloud.com\/v2\/000000","versionInfo":"https:\/\/syd.servers.api.rackspacecloud.com\/v2","versionList":"https:\/\/syd.servers.api.rackspacecloud.com\/","versionId":"2"},{"region":"ORD","tenantId":"000000","publicURL":"https:\/\/ord.servers.api.rackspacecloud.com\/v2\/000000","versionInfo":"https:\/\/ord.servers.api.rackspacecloud.com\/v2","versionList":"https:\/\/ord.servers.api.rackspacecloud.com\/","versionId":"2"},{"region":"DFW","tenantId":"000000","publicURL":"https:\/\/dfw.servers.api.rackspacecloud.com\/v2\/000000","versionInfo":"https:\/\/dfw.servers.api.rackspacecloud.com\/v2","versionList":"https:\/\/dfw.servers.api.rackspacecloud.com\/","versionId":"2"},{"region":"IAD","tenantId":"000000","publicURL":"https:\/\/iad.servers.api.rackspacecloud.com\/v2\/000000","versionInfo":"https:\/\/iad.servers.api.rackspacecloud.com\/v2","versionList":"https:\/\/iad.servers.api.rackspacecloud.com\/","versionId":"2"},{"region":"HKG","tenantId":"000000","publicURL":"https:\/\/hkg.servers.api.rackspacecloud.com\/v2\/000000","versionInfo":"https:\/\/hkg.servers.api.rackspacecloud.com\/v2","versionList":"https:\/\/hkg.servers.api.rackspacecloud.com\/","versionId":"2"}],"type":"compute"},{"name":"cloudQueues","endpoints":[{"region":"IAD","tenantId":"000000","publicURL":"https:\/\/iad.queues.api.rackspacecloud.com\/v1\/000000","internalURL":"https:\/\/snet-iad.queues.api.rackspacecloud.com\/v1\/000000"},{"region":"ORD","tenantId":"000000","publicURL":"https:\/\/ord.queues.api.rackspacecloud.com\/v1\/000000","internalURL":"https:\/\/snet-ord.queues.api.rackspacecloud.com\/v1\/000000"},{"region":"DFW","tenantId":"000000","publicURL":"https:\/\/dfw.queues.api.rackspacecloud.com\/v1\/000000","internalURL":"https:\/\/snet-dfw.queues.api.rackspacecloud.com\/v1\/000000"},{"region":"SYD","tenantId":"000000","publicURL":"https:\/\/syd.queues.api.rackspacecloud.com\/v1\/000000","internalURL":"https:\/\/snet-syd.queues.api.rackspacecloud.com\/v1\/000000"},{"region":"HKG","tenantId":"000000","publicURL":"https:\/\/hkg.queues.api.rackspacecloud.com\/v1\/000000","internalURL":"https:\/\/snet-hkg.queues.api.rackspacecloud.com\/v1\/000000"}],"type":"rax:queues"},{"name":"autoscale","endpoints":[{"region":"DFW","tenantId":"000000","publicURL":"https:\/\/dfw.autoscale.api.rackspacecloud.com\/v1.0\/000000"},{"region":"ORD","tenantId":"000000","publicURL":"https:\/\/ord.autoscale.api.rackspacecloud.com\/v1.0\/000000"},{"region":"SYD","tenantId":"000000","publicURL":"https:\/\/syd.autoscale.api.rackspacecloud.com\/v1.0\/000000"},{"region":"IAD","tenantId":"000000","publicURL":"https:\/\/iad.autoscale.api.rackspacecloud.com\/v1.0\/000000"},{"region":"HKG","tenantId":"000000","publicURL":"https:\/\/hkg.autoscale.api.rackspacecloud.com\/v1.0\/000000"}],"type":"rax:autoscale"},{"name":"cloudOrchestration","endpoints":[{"region":"SYD","tenantId":"000000","publicURL":"https:\/\/syd.orchestration.api.rackspacecloud.com\/v1\/000000"},{"region":"IAD","tenantId":"000000","publicURL":"https:\/\/iad.orchestration.api.rackspacecloud.com\/v1\/000000"},{"region":"ORD","tenantId":"000000","publicURL":"https:\/\/ord.orchestration.api.rackspacecloud.com\/v1\/000000"},{"region":"DFW","tenantId":"000000","publicURL":"https:\/\/dfw.orchestration.api.rackspacecloud.com\/v1\/000000"}],"type":"orchestration"},{"name":"cloudBackup","endpoints":[{"region":"IAD","tenantId":"000000","publicURL":"https:\/\/iad.backup.api.rackspacecloud.com\/v1.0\/000000"},{"region":"DFW","tenantId":"000000","publicURL":"https:\/\/dfw.backup.api.rackspacecloud.com\/v1.0\/000000"},{"region":"ORD","tenantId":"000000","publicURL":"https:\/\/ord.backup.api.rackspacecloud.com\/v1.0\/000000"},{"region":"SYD","tenantId":"000000","publicURL":"https:\/\/syd.backup.api.rackspacecloud.com\/v1.0\/000000"},{"region":"HKG","tenantId":"000000","publicURL":"https:\/\/hkg.backup.api.rackspacecloud.com\/v1.0\/000000"}],"type":"rax:backup"},{"name":"cloudImages","endpoints":[{"region":"IAD","tenantId":"000000","publicURL":"https:\/\/iad.images.api.rackspacecloud.com\/v2\/000000"},{"region":"ORD","tenantId":"000000","publicURL":"https:\/\/ord.images.api.rackspacecloud.com\/v2\/000000"},{"region":"DFW","tenantId":"000000","publicURL":"https:\/\/dfw.images.api.rackspacecloud.com\/v2\/000000"},{"region":"SYD","tenantId":"000000","publicURL":"https:\/\/syd.images.api.rackspacecloud.com\/v2\/000000"},{"region":"HKG","tenantId":"000000","publicURL":"https:\/\/hkg.images.api.rackspacecloud.com\/v2\/000000"}],"type":"image"},{"name":"cloudDNS","endpoints":[{"tenantId":"000000","publicURL":"https:\/\/dns.api.rackspacecloud.com\/v1.0\/000000"}],"type":"rax:dns"},{"name":"cloudMonitoring","endpoints":[{"tenantId":"000000","publicURL":"https:\/\/monitoring.api.rackspacecloud.com\/v1.0\/000000"}],"type":"rax:monitor"},{"name":"cloudServers","endpoints":[{"tenantId":"000000","publicURL":"https:\/\/servers.api.rackspacecloud.com\/v1.0\/000000","versionInfo":"https:\/\/servers.api.rackspacecloud.com\/v1.0","versionList":"https:\/\/servers.api.rackspacecloud.com\/","versionId":"1.0"}],"type":"compute"}],"user":{"id":"296063","roles":[{"id":"10000150","description":"Checkmate
|
|
113
113
|
Access role","name":"checkmate"},{"tenantId":"_CDN-TENANT-NAME_","id":"5","description":"A
|
|
114
114
|
Role that allows a user access to keystone Service methods","name":"object-store:default"},{"tenantId":"000000","id":"6","description":"A
|
|
115
115
|
Role that allows a user access to keystone Service methods","name":"compute:default"},{"id":"3","description":"User
|
|
116
116
|
Admin Role.","name":"identity:user-admin"}],"name":"_RAX_USERNAME_","RAX-AUTH:defaultRegion":"DFW"}}}'
|
|
117
117
|
http_version:
|
|
118
|
-
recorded_at:
|
|
118
|
+
recorded_at: Tue, 04 Mar 2014 21:23:43 GMT
|
|
119
119
|
- request:
|
|
120
120
|
method: get
|
|
121
121
|
uri: https://servers.api.rackspacecloud.com/v1.0/000000/images/detail.json
|
|
@@ -124,7 +124,7 @@ http_interactions:
|
|
|
124
124
|
string: ''
|
|
125
125
|
headers:
|
|
126
126
|
User-Agent:
|
|
127
|
-
- fog/1.
|
|
127
|
+
- fog/1.20.0
|
|
128
128
|
Content-Type:
|
|
129
129
|
- application/json
|
|
130
130
|
Accept:
|
|
@@ -147,7 +147,7 @@ http_interactions:
|
|
|
147
147
|
x-purge-key:
|
|
148
148
|
- /000000/images
|
|
149
149
|
Date:
|
|
150
|
-
-
|
|
150
|
+
- Tue, 04 Mar 2014 21:23:44 GMT
|
|
151
151
|
Via:
|
|
152
152
|
- 1.1 Repose (Repose/2.11.0), 1.1 varnish
|
|
153
153
|
Connection:
|
|
@@ -187,5 +187,5 @@ http_interactions:
|
|
|
187
187
|
5.8"},{"id":89,"status":"ACTIVE","updated":"2011-10-04T08:39:34-05:00","name":"Windows
|
|
188
188
|
Server 2008 R2 x64 + SQL Server 2008 R2 Web"}]}'
|
|
189
189
|
http_version:
|
|
190
|
-
recorded_at:
|
|
190
|
+
recorded_at: Tue, 04 Mar 2014 21:23:44 GMT
|
|
191
191
|
recorded_with: VCR 2.8.0
|