pupistry 0.0.11 → 0.0.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +19 -8
- data/lib/pupistry/agent.rb +1 -0
- 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: 9115de292a5e3f0d311106668e5fd4bcaff4d6c9
|
4
|
+
data.tar.gz: f8edac31e048b92bb700fb7c39b5efb9e0842f67
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1b9d62141382fe5c9e62e20f7858f6917c52c877ff8b33c9e14820b80b886538fbb267303848da5a5e6b56b1d762f3bf8ed5ddb73b58bcfb9905a9095eacbb1b
|
7
|
+
data.tar.gz: ff1342d57c5c5f818693fef2b343edcb73f5eb449349f492541074b017e84a145e4b1fefe0ad38193b5dff3eff3c12a5086fb2ccae5b0485a41dafcbbb644305
|
data/README.md
CHANGED
@@ -188,6 +188,9 @@ system init file gets installed that sets this daemon up for you automatically.
|
|
188
188
|
|
189
189
|
pupistry apply --daemon
|
190
190
|
|
191
|
+
Note that the daemon runs & logs to the foreground if you run it like the above,
|
192
|
+
the init script handles the syslog & backgrounding for you (why code what the
|
193
|
+
init system can do for us?).
|
191
194
|
|
192
195
|
Alternatively, if you don't wish to use Pupistry to run the nodes, you don't
|
193
196
|
have to. You can use Pupistry to build the artifacts and then pull them down
|
@@ -250,22 +253,25 @@ will do the trick:
|
|
250
253
|
---
|
251
254
|
:backends: yaml
|
252
255
|
:yaml:
|
253
|
-
:datadir: "%{::settings::confdir}
|
256
|
+
:datadir: "%{::settings::confdir}/%{::environment}/hieradata"
|
254
257
|
:hierarchy:
|
255
258
|
- "environments/%{::environment}"
|
256
259
|
- "nodes/%{::hostname}"
|
257
260
|
- common
|
258
261
|
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
+
Pupistry will override the default `%{::settings::confdir}` value with wherever
|
263
|
+
the Pupistry agent has been configured to write to (by default this will be the
|
264
|
+
Puppet-4 style `/etc/puppetlabs/code/environments` path) so this Hiera config
|
265
|
+
should work fine for any Pupistry deployed setups.
|
262
266
|
|
263
|
-
|
264
|
-
|
267
|
+
If you're using a hybrid of Pupistry and masterful Puppet, you may need to adjust
|
268
|
+
the `datadir` parameter in Hiera to a fixed path and the `puppetcode` parameter
|
269
|
+
in Pupistry to be the exact same value, since `%{::settings::confdir}` will
|
270
|
+
differ between Pupistry and masterful Puppet.
|
265
271
|
|
266
272
|
Pupistry will default to applying the "master" branch if one is not listed, if
|
267
273
|
you are doing branch-based environments, you can specifiy when bootstrapping
|
268
|
-
and override on a per-execution basis
|
274
|
+
and override on a per-execution basis with `--environment`.
|
269
275
|
|
270
276
|
You'll notice pretty quickly if something is broken when doing `pupistry apply`
|
271
277
|
|
@@ -275,7 +281,6 @@ to Puppetfile and add them to the relevent machines in manifests/site.pp.
|
|
275
281
|
|
276
282
|
https://github.com/jethrocarr/pupistry-samplepuppet
|
277
283
|
|
278
|
-
|
279
284
|
TODO: Longer term intend to add support for various popular structure, but
|
280
285
|
for now it is what it is. It's not hard, check out bin/puppistry and send
|
281
286
|
pull requests.
|
@@ -301,6 +306,12 @@ Puppetfile:
|
|
301
306
|
# Install the Pupistry companion module
|
302
307
|
mod 'jethrocarr/pupistry'
|
303
308
|
|
309
|
+
And include the pupistry module in all your systems:
|
310
|
+
|
311
|
+
node default {
|
312
|
+
include pupistry
|
313
|
+
...
|
314
|
+
}
|
304
315
|
|
305
316
|
|
306
317
|
## 4. Building you first node (Bootstrapping)
|
data/lib/pupistry/agent.rb
CHANGED
@@ -154,6 +154,7 @@ module Pupistry
|
|
154
154
|
end
|
155
155
|
|
156
156
|
puppet_cmd += " --environment #{environment}"
|
157
|
+
puppet_cmd += " --confdir #{$config["agent"]["puppetcode"]}"
|
157
158
|
puppet_cmd += " --modulepath #{$config["agent"]["puppetcode"]}/#{environment}/modules/"
|
158
159
|
puppet_cmd += " --hiera_config #{$config["agent"]["puppetcode"]}/#{environment}/hiera.yaml"
|
159
160
|
puppet_cmd += " #{$config["agent"]["puppetcode"]}/#{environment}/manifests/site.pp"
|