foreman_xen 1.0.0 → 1.0.1
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b1d82be38f1f700f7b148b32f66442aeb33191cc655fc2ae3e088225a9f1046e
|
4
|
+
data.tar.gz: 6f02086fd18bfc2e3cb9023ea9b6093d86e234cdc1971698c6a4a0c6bd9f7ff0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4c3cca9a23cebd948380b88bb7630920f6458eb2d7eaa6c054aa97194ed2167b9ae2fdcb00f686da3a8cfc4a03edaaa59eb5d7864c9cca9b932268fe24f9853e
|
7
|
+
data.tar.gz: 50c7e5b44b0f6878102c77af41d8b3b81058ae52fbcfe1b7466dadded411b7db5660749b2c69070771d2810173008e918e7ac8364ad24427c417ee4444c94264
|
File without changes
|
@@ -273,8 +273,8 @@ module ForemanXen
|
|
273
273
|
{
|
274
274
|
name: args[:name],
|
275
275
|
name_description: args[:comment],
|
276
|
-
|
277
|
-
|
276
|
+
vcpus_max: args[:vcpus_max],
|
277
|
+
vcpus_at_startup: args[:vcpus_max],
|
278
278
|
memory_static_max: args[:memory_max],
|
279
279
|
memory_dynamic_max: args[:memory_max],
|
280
280
|
memory_dynamic_min: args[:memory_min],
|
@@ -374,9 +374,9 @@ module ForemanXen
|
|
374
374
|
mem = %w[memory_static_max memory_dynamic_max
|
375
375
|
memory_dynamic_min memory_static_min]
|
376
376
|
mem.reverse! if vm.memory_static_max.to_i > attr[:memory_static_max].to_i
|
377
|
-
# VCPU values must satisfy: 0 <
|
378
|
-
cpu = %w[
|
379
|
-
cpu.reverse! if vm.vcpus_at_startup > attr[:
|
377
|
+
# VCPU values must satisfy: 0 < vcpus_at_startup <= vcpus_max
|
378
|
+
cpu = %w[vcpus_max vcpus_at_startup]
|
379
|
+
cpu.reverse! if vm.vcpus_at_startup > attr[:vcpus_at_startup]
|
380
380
|
(mem + cpu).each { |e| vm.set_attribute e, attr[e.to_sym] }
|
381
381
|
end
|
382
382
|
|
data/lib/foreman_xen/engine.rb
CHANGED
@@ -53,12 +53,12 @@ module ForemanXen
|
|
53
53
|
require File.expand_path('../../app/models/concerns/foreman_xen/host_helper_extensions', __dir__)
|
54
54
|
require File.expand_path('../../app/models/concerns/foreman_xen/host_extensions', __dir__)
|
55
55
|
|
56
|
-
Fog::XenServer::Compute::Models::Server.
|
57
|
-
Fog::XenServer::Compute::Models::Host.
|
58
|
-
Fog::XenServer::Compute::Models::Vdi.
|
59
|
-
Fog::XenServer::Compute::Models::StorageRepository.
|
60
|
-
::HostsHelper.
|
61
|
-
::Host::Managed.
|
56
|
+
Fog::XenServer::Compute::Models::Server.include ::FogExtensions::Xenserver::Server
|
57
|
+
Fog::XenServer::Compute::Models::Host.include ::FogExtensions::Xenserver::Host
|
58
|
+
Fog::XenServer::Compute::Models::Vdi.include ::FogExtensions::Xenserver::Vdi
|
59
|
+
Fog::XenServer::Compute::Models::StorageRepository.include ::FogExtensions::Xenserver::StorageRepository
|
60
|
+
::HostsHelper.include ForemanXen::HostHelperExtensions
|
61
|
+
::Host::Managed.prepend ForemanXen::HostExtensions
|
62
62
|
rescue => e
|
63
63
|
Rails.logger.warn "Foreman-Xen: skipping engine hook (#{e})"
|
64
64
|
end
|
data/lib/foreman_xen/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: foreman_xen
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Pavel Nemirovsky
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date:
|
13
|
+
date: 2020-02-02 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: fog-xenserver
|