knife-xenserver 1.2.2 → 1.2.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/CHANGELOG.md +5 -0
- data/knife-xenserver.gemspec +0 -1
- data/lib/chef/knife/xenserver_base.rb +4 -1
- data/lib/chef/knife/xenserver_template_list.rb +1 -1
- data/lib/chef/knife/xenserver_vm_create.rb +1 -2
- data/lib/chef/knife/xenserver_vm_list.rb +1 -1
- data/lib/knife-xenserver/version.rb +1 -1
- metadata +2 -18
data/CHANGELOG.md
CHANGED
data/knife-xenserver.gemspec
CHANGED
@@ -33,7 +33,6 @@ class Chef
|
|
33
33
|
require 'readline'
|
34
34
|
require 'chef/json_compat'
|
35
35
|
require 'terminal-table/import'
|
36
|
-
require 'alchemist'
|
37
36
|
end
|
38
37
|
|
39
38
|
option :xenserver_password,
|
@@ -92,6 +91,10 @@ class Chef
|
|
92
91
|
Chef::Config[:knife][key] || config[key]
|
93
92
|
end
|
94
93
|
|
94
|
+
def bytes_to_megabytes(bytes)
|
95
|
+
(bytes.to_i / (1024.0 * 1024.0)).round
|
96
|
+
end
|
97
|
+
|
95
98
|
end
|
96
99
|
end
|
97
100
|
end
|
@@ -53,7 +53,7 @@ class Chef
|
|
53
53
|
networks << name
|
54
54
|
end
|
55
55
|
networks = networks.join("\n")
|
56
|
-
mem = vm.memory_static_max
|
56
|
+
mem = bytes_to_megabytes(vm.memory_static_max)
|
57
57
|
t << ["#{vm.name}\n #{ui.color('uuid: ', :yellow)}#{vm.uuid}", mem, vm.tools_installed?, networks]
|
58
58
|
end
|
59
59
|
end
|
@@ -27,7 +27,6 @@ class Chef
|
|
27
27
|
|
28
28
|
deps do
|
29
29
|
require 'readline'
|
30
|
-
require 'alchemist'
|
31
30
|
require 'chef/json_compat'
|
32
31
|
require 'chef/knife/bootstrap'
|
33
32
|
Chef::Knife::Bootstrap.load_deps
|
@@ -252,7 +251,7 @@ class Chef
|
|
252
251
|
vm.reload
|
253
252
|
|
254
253
|
puts "#{ui.color("VM Name", :cyan)}: #{vm.name}"
|
255
|
-
puts "#{ui.color("VM Memory", :cyan)}: #{vm.memory_static_max
|
254
|
+
puts "#{ui.color("VM Memory", :cyan)}: #{bytes_to_megabytes(vm.memory_static_max)} MB"
|
256
255
|
|
257
256
|
if !config[:skip_bootstrap]
|
258
257
|
# wait for it to be ready to do stuff
|
metadata
CHANGED
@@ -2,14 +2,14 @@
|
|
2
2
|
name: knife-xenserver
|
3
3
|
version: !ruby/object:Gem::Version
|
4
4
|
prerelease:
|
5
|
-
version: 1.2.
|
5
|
+
version: 1.2.3
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Sergio Rubio
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2013-01-06 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
type: :runtime
|
@@ -75,22 +75,6 @@ dependencies:
|
|
75
75
|
- !ruby/object:Gem::Version
|
76
76
|
version: '0'
|
77
77
|
name: colored
|
78
|
-
- !ruby/object:Gem::Dependency
|
79
|
-
type: :runtime
|
80
|
-
requirement: !ruby/object:Gem::Requirement
|
81
|
-
none: false
|
82
|
-
requirements:
|
83
|
-
- - ! '>='
|
84
|
-
- !ruby/object:Gem::Version
|
85
|
-
version: '0'
|
86
|
-
prerelease: false
|
87
|
-
version_requirements: !ruby/object:Gem::Requirement
|
88
|
-
none: false
|
89
|
-
requirements:
|
90
|
-
- - ! '>='
|
91
|
-
- !ruby/object:Gem::Version
|
92
|
-
version: '0'
|
93
|
-
name: alchemist
|
94
78
|
- !ruby/object:Gem::Dependency
|
95
79
|
type: :runtime
|
96
80
|
requirement: !ruby/object:Gem::Requirement
|