opennebula 6.4.5 → 6.4.6
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.
- checksums.yaml +4 -4
- data/lib/cloud/CloudClient.rb +1 -1
- data/lib/models/role.rb +2 -2
- data/lib/opennebula/client.rb +2 -2
- data/lib/opennebula/ldap_auth.rb +2 -2
- data/lib/opennebula/oneflow_client.rb +7 -4
- data/lib/opennebula.rb +1 -1
- data/lib/scripts_common.rb +0 -3
- data/lib/virtual_machine.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1a95c466615797446ff59c56f025cd24189252b20b4ebbfe74e014dcdabae31f
|
4
|
+
data.tar.gz: ce36fa2c5d7e790e901a4c3d34dfb0640bff319628ccbde2d0d19c949d7a636e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d94ce7a4e3efd9dc50942606be49edcdeb1f58e94bb83ebe98ca6577e2b26943f6ba51e4c1da001f3a63e2f62ad1cf5770e79f54aaef5b2413376c6b3b6da443
|
7
|
+
data.tar.gz: 89bebd801fcae46af21192d7d2a93c8e65d9ee81b8c0e0e4f9621e827c7717414dde553134876ee331fdd42c559d18fd91168446dff80eb2e79b14cdd3b792ed
|
data/lib/cloud/CloudClient.rb
CHANGED
data/lib/models/role.rb
CHANGED
@@ -634,8 +634,8 @@ module OpenNebula
|
|
634
634
|
return OpenNebula::Error.new("Role #{name} is in DONE state")
|
635
635
|
end
|
636
636
|
|
637
|
-
do_offset =
|
638
|
-
|
637
|
+
do_offset = !period.nil? && period.to_i > 0 &&
|
638
|
+
!vms_per_period.nil? && vms_per_period.to_i > 0
|
639
639
|
|
640
640
|
nodes.each_with_index do |node, index|
|
641
641
|
vm_id = node['deploy_id']
|
data/lib/opennebula/client.rb
CHANGED
@@ -140,9 +140,9 @@ module OpenNebula
|
|
140
140
|
@one_endpoint = endpoint
|
141
141
|
elsif ENV["ONE_XMLRPC"]
|
142
142
|
@one_endpoint = ENV["ONE_XMLRPC"]
|
143
|
-
elsif ENV['HOME'] and File.
|
143
|
+
elsif ENV['HOME'] and File.exist?(ENV['HOME']+"/.one/one_endpoint")
|
144
144
|
@one_endpoint = File.read(ENV['HOME']+"/.one/one_endpoint")
|
145
|
-
elsif File.
|
145
|
+
elsif File.exist?("/var/lib/one/.one/one_endpoint")
|
146
146
|
@one_endpoint = File.read("/var/lib/one/.one/one_endpoint")
|
147
147
|
else
|
148
148
|
@one_endpoint = "http://localhost:2633/RPC2"
|
data/lib/opennebula/ldap_auth.rb
CHANGED
@@ -89,7 +89,7 @@ class OpenNebula::LdapAuth
|
|
89
89
|
file=@options[:mapping_file_path]
|
90
90
|
generate = false
|
91
91
|
|
92
|
-
if File.
|
92
|
+
if File.exist?(file)
|
93
93
|
stat = File.stat(file)
|
94
94
|
age = Time.now.to_i - stat.mtime.to_i
|
95
95
|
generate = true if age > @options[:mapping_timeout]
|
@@ -124,7 +124,7 @@ class OpenNebula::LdapAuth
|
|
124
124
|
|
125
125
|
@mapping = {}
|
126
126
|
|
127
|
-
if File.
|
127
|
+
if File.exist?(file)
|
128
128
|
@mapping = YAML.load(File.read(file))
|
129
129
|
end
|
130
130
|
|
@@ -339,9 +339,9 @@ module Service
|
|
339
339
|
url = opts[:url]
|
340
340
|
elsif ENV['ONEFLOW_URL']
|
341
341
|
url = ENV['ONEFLOW_URL']
|
342
|
-
elsif ENV['HOME'] && File.
|
342
|
+
elsif ENV['HOME'] && File.exist?(ENV['HOME'] + endpoint)
|
343
343
|
url = File.read(ENV['HOME'] + endpoint).strip
|
344
|
-
elsif File.
|
344
|
+
elsif File.exist?('/var/lib/one/.one/oneflow_endpoint')
|
345
345
|
url = File.read('/var/lib/one/.one/oneflow_endpoint').strip
|
346
346
|
else
|
347
347
|
url = 'http://localhost:2474'
|
@@ -454,11 +454,14 @@ module Service
|
|
454
454
|
|
455
455
|
req['User-Agent'] = @user_agent
|
456
456
|
|
457
|
-
|
457
|
+
if !@uri.path.nil?
|
458
|
+
req.instance_variable_set(:@path, @uri.path + req.path)
|
459
|
+
end
|
460
|
+
|
461
|
+
CloudClient.http_start(@uri, @timeout) do |http|
|
458
462
|
http.request(req)
|
459
463
|
end
|
460
464
|
|
461
|
-
res
|
462
465
|
end
|
463
466
|
end
|
464
467
|
end
|
data/lib/opennebula.rb
CHANGED
data/lib/scripts_common.rb
CHANGED
data/lib/virtual_machine.rb
CHANGED
@@ -2720,7 +2720,7 @@ end
|
|
2720
2720
|
img_name = VCenterDriver::FileHelper.unescape_path(img_name_escaped)
|
2721
2721
|
|
2722
2722
|
vc_disks.each do |d|
|
2723
|
-
key_matches =
|
2723
|
+
key_matches = unmanaged_key && d[:key] == unmanaged_key.to_i
|
2724
2724
|
path_matches = (d[:path_wo_ds] == img_name)
|
2725
2725
|
|
2726
2726
|
if key_matches || path_matches
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: opennebula
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 6.4.
|
4
|
+
version: 6.4.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- OpenNebula
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2024-06-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: nokogiri
|