lita-puppet 0.4.3 → 0.4.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +4 -4
- data/lib/lita/handlers/puppet.rb +16 -7
- data/lita-puppet.gemspec +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2aa21342d3d5e83f647f5fe4e5505296312ed140
|
|
4
|
+
data.tar.gz: 6375df6c085c10394324a17203027d2513ddb010
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fe1343afe13bc2271e6927d3a96f6be40ac6a5e795a9e0f7217587e93b206029eef50b67f8da61277e097f6202cc9542f30f67ccb57d04e7d633d59d5e8d1499
|
|
7
|
+
data.tar.gz: a75a7ec0ce376d0d80321140dc1e9ebb72f0e21f47de36a5e6cf14e2a2e01fb5ee1cce3243fc289fee8bf043550810f928826ca19c62da86a707c4c07d277589
|
data/README.md
CHANGED
|
@@ -19,13 +19,13 @@ gem "lita-puppet"
|
|
|
19
19
|
## Usage
|
|
20
20
|
|
|
21
21
|
#### Deploying an environment via r10k
|
|
22
|
-
puppet r10k [environment]
|
|
22
|
+
puppet r10k [environment [module]]
|
|
23
23
|
|
|
24
24
|
This is also available as:
|
|
25
25
|
|
|
26
|
-
puppet deploy [environment]
|
|
27
|
-
pp deploy [environment]
|
|
28
|
-
pp r10k [environment]
|
|
26
|
+
puppet deploy [environment [module]]
|
|
27
|
+
pp deploy [environment [module]]
|
|
28
|
+
pp r10k [environment [module]]
|
|
29
29
|
|
|
30
30
|
#### Trigger a manual run of the Puppet agent on a host
|
|
31
31
|
puppet agent run on <host>
|
data/lib/lita/handlers/puppet.rb
CHANGED
|
@@ -25,11 +25,11 @@ module Lita
|
|
|
25
25
|
)
|
|
26
26
|
|
|
27
27
|
route(
|
|
28
|
-
/(puppet|pp)\s+(r10k|deploy)(\s+(\S+))?/i,
|
|
28
|
+
/(puppet|pp)\s+(r10k|deploy)(\s+(\S+)(\s+(\S+))?)?/i,
|
|
29
29
|
:r10k_deploy,
|
|
30
30
|
command: true,
|
|
31
31
|
help: {
|
|
32
|
-
"puppet r10k [env]" => "Deploy the latest puppet code on the puppet master via r10k, optionally specifying an environment."
|
|
32
|
+
"puppet r10k [env [module]]" => "Deploy the latest puppet code on the puppet master via r10k, optionally specifying an environment, and possibly a module."
|
|
33
33
|
}
|
|
34
34
|
)
|
|
35
35
|
|
|
@@ -50,7 +50,7 @@ module Lita
|
|
|
50
50
|
# scary...
|
|
51
51
|
server.disable_safe_mode
|
|
52
52
|
|
|
53
|
-
server.execute "puppet cert clean #{cert}"
|
|
53
|
+
server.execute "puppet cert clean #{cert} 2>&1"
|
|
54
54
|
end
|
|
55
55
|
|
|
56
56
|
if result[:exception]
|
|
@@ -85,7 +85,7 @@ module Lita
|
|
|
85
85
|
command = 'puppet agent'
|
|
86
86
|
command << ' --verbose --no-daemonize'
|
|
87
87
|
command << ' --no-usecacheonfailure'
|
|
88
|
-
command << ' --no-splay --show_diff'
|
|
88
|
+
command << ' --no-splay --show_diff 2>&1'
|
|
89
89
|
|
|
90
90
|
server.execute command
|
|
91
91
|
end
|
|
@@ -103,6 +103,7 @@ module Lita
|
|
|
103
103
|
|
|
104
104
|
def r10k_deploy(response)
|
|
105
105
|
environment = response.matches[0][3]
|
|
106
|
+
mod = response.matches[0][5]
|
|
106
107
|
control_repo = config.control_repo_path || '/opt/puppet/control'
|
|
107
108
|
user = config.ssh_user || 'lita'
|
|
108
109
|
username = friendly_name(response.user.name)
|
|
@@ -127,9 +128,17 @@ module Lita
|
|
|
127
128
|
# scary...
|
|
128
129
|
server.disable_safe_mode
|
|
129
130
|
|
|
130
|
-
command = "r10k deploy
|
|
131
|
-
|
|
132
|
-
|
|
131
|
+
command = "r10k deploy"
|
|
132
|
+
if environment && mod
|
|
133
|
+
command << ' module'
|
|
134
|
+
command << " -e #{environment}"
|
|
135
|
+
command << " #{mod}"
|
|
136
|
+
command << " -v"
|
|
137
|
+
else
|
|
138
|
+
command << " environment"
|
|
139
|
+
command << " #{environment}" if environment
|
|
140
|
+
command << ' -pv'
|
|
141
|
+
end
|
|
133
142
|
server.execute command
|
|
134
143
|
end
|
|
135
144
|
|
data/lita-puppet.gemspec
CHANGED