puppetfactory 0.5.1 → 0.5.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/puppetfactory +1 -1
- data/lib/puppetfactory/plugins/classification.rb +8 -2
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 74299de61ceea0b68a8d6dbc580a4883098dddc8
|
4
|
+
data.tar.gz: 99ef83e11b7b3eb984f9c704df9c428781b1721b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 971fb391f2c8d3825f7e4a250395faad023cb279680d8399f46866d5ff849af1eb16b1831a3714f26a0852cd9e0e02359c0df8ea5e7400a3b9480469a29cc216
|
7
|
+
data.tar.gz: 956bc8a13ce763d2d6b491abf66de5390113ef11234b8c63c7b77d7c36c1dc63c80159e7fb756b75fffe365b62f0158329fea958b81cebf35dc2e63e51d05cf5
|
data/bin/puppetfactory
CHANGED
@@ -73,7 +73,7 @@ options[:user] ||= 'admin'
|
|
73
73
|
options[:password] ||= 'admin'
|
74
74
|
options[:session] ||= '12345'
|
75
75
|
|
76
|
-
options[:master] ||= `hostname`.strip
|
76
|
+
options[:master] ||= `hostname -f`.strip
|
77
77
|
options[:usersuffix] ||= 'puppetfactory.vm'
|
78
78
|
options[:usergroups] ||= []
|
79
79
|
|
@@ -62,8 +62,14 @@ class Puppetfactory::Plugins::Classification < Puppetfactory::Plugins
|
|
62
62
|
|
63
63
|
def userinfo(username, extended = false)
|
64
64
|
return unless extended
|
65
|
-
|
66
|
-
|
65
|
+
certname = "#{username}.#{@suffix}"
|
66
|
+
|
67
|
+
begin
|
68
|
+
ngid = @puppetclassify.groups.get_group_id(certname)
|
69
|
+
rescue => e
|
70
|
+
$logger.warn "Error retrieving node group #{certname}: #{e.message}"
|
71
|
+
return nil
|
72
|
+
end
|
67
73
|
|
68
74
|
{
|
69
75
|
:username => username,
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: puppetfactory
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ben Ford
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2016-
|
12
|
+
date: 2016-10-03 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: sinatra
|