pupistry 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b516bef9aa8033e4871098cd224fe497ef82f1b6
-  data.tar.gz: 7b158bdc381764e80618a4236e6287d19ac6670e
+  metadata.gz: 9115de292a5e3f0d311106668e5fd4bcaff4d6c9
+  data.tar.gz: f8edac31e048b92bb700fb7c39b5efb9e0842f67
 SHA512:
-  metadata.gz: 8f2f7720b7b9ef5f8042282d49ba3093bfcc4c160bbc8288ba200410daaae4da4842d4b2bc21059879adb0ac4686a841413a58f4be2f90c9ba37a980a3ec5aed
-  data.tar.gz: 3466558b948d2e141fb73a1b7e86ac898dc4d88504133d8b450c14124b1013e6ec42a8f0d421eeacb80904e7e3960b79fd94ed1a31f2df6cb835fabecf898dd7
+  metadata.gz: 1b9d62141382fe5c9e62e20f7858f6917c52c877ff8b33c9e14820b80b886538fbb267303848da5a5e6b56b1d762f3bf8ed5ddb73b58bcfb9905a9095eacbb1b
+  data.tar.gz: ff1342d57c5c5f818693fef2b343edcb73f5eb449349f492541074b017e84a145e4b1fefe0ad38193b5dff3eff3c12a5086fb2ccae5b0485a41dafcbbb644305

data/README.md

@@ -188,6 +188,9 @@ system init file gets installed that sets this daemon up for you automatically.
 
     pupistry apply --daemon
 
+Note that the daemon runs & logs to the foreground if you run it like the above,
+the init script handles the syslog & backgrounding for you (why code what the
+init system can do for us?).
 
 Alternatively, if you don't wish to use Pupistry to run the nodes, you don't
 have to. You can use Pupistry to build the artifacts and then pull them down
@@ -250,22 +253,25 @@ will do the trick:
     ---
     :backends: yaml
     :yaml:
-      :datadir: "%{::settings::confdir}/environments/%{::environment}/hieradata"
+      :datadir: "%{::settings::confdir}/%{::environment}/hieradata"
     :hierarchy:
      - "environments/%{::environment}"
      - "nodes/%{::hostname}"
      - common
 
-Then in Pupistry, the following configuration should be used for the agent (or
-subsitute `/etc/puppet/` for wherever your platform has `%{::settings::confdir}`
-set to).
+Pupistry will override the default `%{::settings::confdir}` value with wherever
+the Pupistry agent has been configured to write to (by default this will be the
+Puppet-4 style `/etc/puppetlabs/code/environments` path) so this Hiera config
+should work fine for any Pupistry deployed setups.
 
-      agent:
-        puppetcode: /etc/puppet/environments
+If you're using a hybrid of Pupistry and masterful Puppet, you may need to adjust
+the `datadir` parameter in Hiera to a fixed path and the `puppetcode` parameter
+in Pupistry to be the exact same value, since `%{::settings::confdir}` will
+differ between Pupistry and masterful Puppet.
 
 Pupistry will default to applying the "master" branch if one is not listed, if
 you are doing branch-based environments, you can specifiy when bootstrapping
-and override on a per-execution basis.
+and override on a per-execution basis with `--environment`.
 
 You'll notice pretty quickly if something is broken when doing `pupistry apply`
 
@@ -275,7 +281,6 @@ to Puppetfile and add them to the relevent machines in manifests/site.pp.
 
 https://github.com/jethrocarr/pupistry-samplepuppet 
 
-
 TODO: Longer term intend to add support for various popular structure, but
 for now it is what it is. It's not hard, check out bin/puppistry and send
 pull requests.
@@ -301,6 +306,12 @@ Puppetfile:
     # Install the Pupistry companion module
     mod 'jethrocarr/pupistry'
 
+And include the pupistry module in all your systems:
+
+    node default {
+      include pupistry
+      ...
+    }
 
 
 ## 4. Building you first node (Bootstrapping)

data/lib/pupistry/agent.rb

@@ -154,6 +154,7 @@ module Pupistry
       end
 
       puppet_cmd += " --environment #{environment}"
+      puppet_cmd += " --confdir #{$config["agent"]["puppetcode"]}"
       puppet_cmd += " --modulepath #{$config["agent"]["puppetcode"]}/#{environment}/modules/"
       puppet_cmd += " --hiera_config #{$config["agent"]["puppetcode"]}/#{environment}/hiera.yaml"
       puppet_cmd += " #{$config["agent"]["puppetcode"]}/#{environment}/manifests/site.pp"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pupistry
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Jethro Carr