ucloudstack 0.0.2 → 0.0.3
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/README.rdoc +1 -1
- data/lib/chef/knife/cs_server_create.rb +3 -2
- data/lib/chef/knife/cs_server_list.rb +4 -2
- data/lib/chef/knife/cs_server_reboot.rb +1 -1
- data/lib/chef/knife/cs_server_start.rb +1 -1
- data/lib/chef/knife/cs_server_stop.rb +1 -1
- data/lib/chef/knife/cs_template_list.rb +3 -2
- data/lib/knife-cloudstack/connection.rb +1 -3
- metadata +2 -2
data/README.rdoc
CHANGED
@@ -195,7 +195,7 @@ Reboots the specified virtual machines(s).
|
|
195
195
|
== LICENSE:
|
196
196
|
|
197
197
|
Author:: Ryan Holmes <rholmes@edmunds.com>
|
198
|
-
Author:: KC Braunschweig <
|
198
|
+
Author:: KC Braunschweig <kcbraunschweig@gmail.com>
|
199
199
|
Author:: John E. Vincent <lusis.org+github.com@gmail.com>
|
200
200
|
|
201
201
|
Copyright:: Copyright (c) 2011 Edmunds, Inc.
|
@@ -23,7 +23,7 @@ module KnifeCloudstack
|
|
23
23
|
class CsServerCreate < Chef::Knife
|
24
24
|
|
25
25
|
# Seconds to delay between detecting ssh and initiating the bootstrap
|
26
|
-
BOOTSTRAP_DELAY =
|
26
|
+
BOOTSTRAP_DELAY = 3
|
27
27
|
|
28
28
|
# Seconds to wait between ssh pings
|
29
29
|
SSH_POLL_INTERVAL = 2
|
@@ -74,6 +74,7 @@ module KnifeCloudstack
|
|
74
74
|
option :public_ip,
|
75
75
|
:long => "--[no-]public-ip",
|
76
76
|
:description => "Allocate a public IP for this server",
|
77
|
+
:boolean => true,
|
77
78
|
:default => true
|
78
79
|
|
79
80
|
option :chef_node_name,
|
@@ -150,7 +151,7 @@ module KnifeCloudstack
|
|
150
151
|
:default => false
|
151
152
|
|
152
153
|
option :no_bootstrap,
|
153
|
-
:long => "--
|
154
|
+
:long => "--no-bootstrap",
|
154
155
|
:description => "Disable Chef bootstrap",
|
155
156
|
:default => true
|
156
157
|
|
@@ -60,7 +60,8 @@ module KnifeCloudstack
|
|
60
60
|
ui.color('Public IP', :bold),
|
61
61
|
ui.color('Service', :bold),
|
62
62
|
ui.color('Template', :bold),
|
63
|
-
ui.color('State', :bold)
|
63
|
+
ui.color('State', :bold),
|
64
|
+
ui.color('Hypervisor', :bold)
|
64
65
|
]
|
65
66
|
|
66
67
|
servers = connection.list_servers
|
@@ -78,8 +79,9 @@ module KnifeCloudstack
|
|
78
79
|
server_list << server['serviceofferingname']
|
79
80
|
server_list << server['templatename']
|
80
81
|
server_list << server['state']
|
82
|
+
server_list << (server['hostname'] || 'N/A')
|
81
83
|
end
|
82
|
-
puts ui.list(server_list, :columns_across,
|
84
|
+
puts ui.list(server_list, :columns_across, 6)
|
83
85
|
|
84
86
|
end
|
85
87
|
|
@@ -62,6 +62,7 @@ module KnifeCloudstack
|
|
62
62
|
)
|
63
63
|
|
64
64
|
template_list = [
|
65
|
+
ui.color('ID', :bold),
|
65
66
|
ui.color('Name', :bold),
|
66
67
|
ui.color('Size', :bold),
|
67
68
|
ui.color('Zone', :bold),
|
@@ -73,14 +74,14 @@ module KnifeCloudstack
|
|
73
74
|
templates = connection.list_templates(filter)
|
74
75
|
|
75
76
|
templates.each do |t|
|
76
|
-
|
77
|
+
template_list << t['id']
|
77
78
|
template_list << t['name']
|
78
79
|
template_list << (human_file_size(t['size']) || 'Unknown')
|
79
80
|
template_list << t['zonename']
|
80
81
|
template_list << t['ispublic'].to_s
|
81
82
|
template_list << t['created']
|
82
83
|
end
|
83
|
-
puts ui.list(template_list, :columns_across,
|
84
|
+
puts ui.list(template_list, :columns_across, 6)
|
84
85
|
|
85
86
|
end
|
86
87
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
#
|
2
2
|
# Author:: Ryan Holmes (<rholmes@edmunds.com>)
|
3
|
-
# Author:: KC Braunschweig (<
|
3
|
+
# Author:: KC Braunschweig (<kcbraunschweig@gmail.com>)
|
4
4
|
# Copyright:: Copyright (c) 2011 Edmunds, Inc.
|
5
5
|
# License:: Apache License, Version 2.0
|
6
6
|
#
|
@@ -22,7 +22,6 @@ require 'base64'
|
|
22
22
|
require 'openssl'
|
23
23
|
require 'uri'
|
24
24
|
require 'cgi'
|
25
|
-
require 'net/http'
|
26
25
|
require 'net/https'
|
27
26
|
require 'json'
|
28
27
|
|
@@ -556,7 +555,6 @@ module CloudstackClient
|
|
556
555
|
def send_request(params)
|
557
556
|
params['response'] = 'json'
|
558
557
|
params['apiKey'] = @api_key
|
559
|
-
|
560
558
|
params_arr = []
|
561
559
|
params.sort.each { |elem|
|
562
560
|
params_arr << elem[0].to_s + '=' + elem[1].to_s
|
metadata
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
name: ucloudstack
|
3
3
|
version: !ruby/object:Gem::Version
|
4
4
|
prerelease:
|
5
|
-
version: 0.0.
|
5
|
+
version: 0.0.3
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Ryan Holmes
|
@@ -13,7 +13,7 @@ autorequire:
|
|
13
13
|
bindir: bin
|
14
14
|
cert_chain: []
|
15
15
|
|
16
|
-
date: 2012-09-
|
16
|
+
date: 2012-09-21 00:00:00 Z
|
17
17
|
dependencies:
|
18
18
|
- !ruby/object:Gem::Dependency
|
19
19
|
name: chef
|