opennebula 4.10.0 → 4.10.1
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/opennebula.rb +1 -1
- data/lib/opennebula/ldap_auth.rb +5 -2
- data/lib/opennebula/virtual_network.rb +1 -1
- metadata +16 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 53be4f56beda701c8e172f10df16343341575986
|
|
4
|
+
data.tar.gz: 03c9ce0ee420e3533ac41cc9ddaa498a7d9e5b15
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f17bf4ebeacf62e148cfffb7dd04f87cf1b345727d35f9fd2215a7c1a460cd0305f1e26eda134c6232fb11fd9be2618125723ea6275aad805315a1dedb1a3881
|
|
7
|
+
data.tar.gz: 892988839b64e8bb857454e71c14d3fd8f0e0684b87bbe886c8f80f747563a9d72f0327f96d3cba17a1cededf8199cbbf3c158950d7c6e9837581c7d1782af51
|
data/lib/opennebula.rb
CHANGED
data/lib/opennebula/ldap_auth.rb
CHANGED
|
@@ -47,7 +47,8 @@ class OpenNebula::LdapAuth
|
|
|
47
47
|
:mapping_timeout => 300,
|
|
48
48
|
:mapping_filename => 'server1.yaml',
|
|
49
49
|
:mapping_key => 'GROUP_DN',
|
|
50
|
-
:mapping_default => 1
|
|
50
|
+
:mapping_default => 1,
|
|
51
|
+
:attributes => [ "memberOf" ]
|
|
51
52
|
}.merge(options)
|
|
52
53
|
|
|
53
54
|
ops={}
|
|
@@ -123,6 +124,7 @@ class OpenNebula::LdapAuth
|
|
|
123
124
|
begin
|
|
124
125
|
result=@ldap.search(
|
|
125
126
|
:base => @options[:base],
|
|
127
|
+
:attributes => @options[:attributes],
|
|
126
128
|
:filter => "#{@options[:user_field]}=#{name}")
|
|
127
129
|
|
|
128
130
|
if result && result.first
|
|
@@ -146,6 +148,7 @@ class OpenNebula::LdapAuth
|
|
|
146
148
|
def is_in_group?(user, group)
|
|
147
149
|
result=@ldap.search(
|
|
148
150
|
:base => group,
|
|
151
|
+
:attributes => @options[:group_field],
|
|
149
152
|
:filter => "(#{@options[:group_field]}=#{user.first})")
|
|
150
153
|
|
|
151
154
|
if result && result.first
|
|
@@ -183,7 +186,7 @@ class OpenNebula::LdapAuth
|
|
|
183
186
|
end
|
|
184
187
|
|
|
185
188
|
groups.delete(false)
|
|
186
|
-
groups.compact
|
|
189
|
+
groups.compact.uniq
|
|
187
190
|
end
|
|
188
191
|
end
|
|
189
192
|
|
|
@@ -236,7 +236,7 @@ module OpenNebula
|
|
|
236
236
|
return Error.new('ID not defined') if !@pe_id
|
|
237
237
|
|
|
238
238
|
rtmpl = "SIZE = #{rsize}\n"
|
|
239
|
-
rtmpl << "NAME = #{rname}\n" if !rname.nil?
|
|
239
|
+
rtmpl << "NAME = \"#{rname}\"\n" if !rname.nil?
|
|
240
240
|
rtmpl << "AR_ID = #{ar_id}\n" if !ar_id.nil?
|
|
241
241
|
rtmpl << "NETWORK_ID = #{vnet}\n" if !vnet.nil?
|
|
242
242
|
|
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: 4.10.
|
|
4
|
+
version: 4.10.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- OpenNebula
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-11-
|
|
11
|
+
date: 2014-11-20 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: nokogiri
|
|
@@ -38,6 +38,20 @@ dependencies:
|
|
|
38
38
|
- - ">="
|
|
39
39
|
- !ruby/object:Gem::Version
|
|
40
40
|
version: '0'
|
|
41
|
+
- !ruby/object:Gem::Dependency
|
|
42
|
+
name: rbvmomi
|
|
43
|
+
requirement: !ruby/object:Gem::Requirement
|
|
44
|
+
requirements:
|
|
45
|
+
- - ">="
|
|
46
|
+
- !ruby/object:Gem::Version
|
|
47
|
+
version: '0'
|
|
48
|
+
type: :runtime
|
|
49
|
+
prerelease: false
|
|
50
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
51
|
+
requirements:
|
|
52
|
+
- - ">="
|
|
53
|
+
- !ruby/object:Gem::Version
|
|
54
|
+
version: '0'
|
|
41
55
|
description: Libraries needed to talk to OpenNebula
|
|
42
56
|
email: contact@opennebula.org
|
|
43
57
|
executables: []
|