From 59b6c2e0b2b0d74caf1c8ce392ec219e5c25d399 Mon Sep 17 00:00:00 2001
From: Adam Henry Lewenberg <adamhl@stanford.edu>
Date: Tue, 24 Feb 2015 14:34:52 -0800
Subject: [PATCH] release/004.027: define basemodulepath for puppetservice1-dev
---
NEWS | 13 +++++++++----
templates/puppetclient/puppet.conf.template.erb | 11 +++++++++++
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/NEWS b/NEWS
index 894d66f..5ea492f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,17 @@
+release/004.027 (2015-02-24)
+
+ [puppetclient] Set up basemodulepath configuration directive for
+ puppetservice1-dev (adamhl)
+
release/004.026 (2015-02-24)
[yumtools] added new group of yum-related
commands that can be used to manage package
pins, groups, yum plugins and gpg keys
- (jlent)
+ (jlent)
release/004.025 (2015-02-23)
- [rpm] regression of the ensure of the
+ [rpm] regression of the ensure of the
versionlock.list file. A blank version of this
file is already installed with yum-*-versionlock,
and since a single file is used for all current
@@ -29,8 +34,8 @@ release/004.023 (2015-02-20)
release/004.022 (2015-02-17)
- [syslog] Correct template names for the impstats fragments that
- support debugging rsyslog problems. Update the documentation in
+ [syslog] Correct template names for the impstats fragments that
+ support debugging rsyslog problems. Update the documentation in
the base::syslog::fragment to make debugging a bit easier.
release/004.021 (2015-02-17)
diff --git a/templates/puppetclient/puppet.conf.template.erb b/templates/puppetclient/puppet.conf.template.erb
index 693fa0f..653f13d 100644
--- a/templates/puppetclient/puppet.conf.template.erb
+++ b/templates/puppetclient/puppet.conf.template.erb
@@ -147,6 +147,17 @@ rundir = /var/run/puppet
# when acting as puppet master, so we use a different directory.
ssldir = /srv/puppetmaster/ssl
<% end -%>
+<% if (hostname =~ /puppetservice1-dev/) then -%>
+
+# Here we the GLOBAL module search path. This path is searched by ALL
+# environments. This is usefule when you have Puppet code that you want
+# all your environments to have access to, e.g., stdlib.
+#
+# Note well that for this path to be seen, you need to append it to the
+# modulepath directgive in each environments environment.conf, e.g.,
+# modulepath = services:modules:$basemodulepath
+basemodulepath = /usr/share/puppet/modules
+<% end -%>
# List of reports to run
<% if (puppet3) -%>
--
GitLab