Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221563
Change subject: Add an additional puppet config to use with minimal runs.
......................................................................
Add an additional puppet config to use with minimal runs.
Change-Id: I642ba771fb1197579d1a6de634efde55f5f28fda
---
M modules/base/manifests/puppet.pp
M modules/base/templates/puppet.conf.d/10-main.conf.erb
2 files changed, 20 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/63/221563/1
diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index 9889f69..8dc56bb 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -44,6 +44,14 @@
subscribe => File['/etc/puppet/puppet.conf.d/10-main.conf'],
refreshonly => true,
}
+
+ $puppetbasics = "basic.puppet.node"
+ file { '/etc/puppet/puppetbasics.conf':
+ content => template('base/puppet.conf.d/10-main.conf.erb'),
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ }
}
class { 'puppet_statsd':
diff --git a/modules/base/templates/puppet.conf.d/10-main.conf.erb
b/modules/base/templates/puppet.conf.d/10-main.conf.erb
index 9c5d4a3..89b6b38 100644
--- a/modules/base/templates/puppet.conf.d/10-main.conf.erb
+++ b/modules/base/templates/puppet.conf.d/10-main.conf.erb
@@ -1,6 +1,13 @@
#####################################################################
##### THIS FILE IS MANAGED BY PUPPET
##### as template('base/puppet.conf.d/10-main.conf.erb')
+<% if @puppetbasics %>
+####
+#### This is a special labs puppet config that applies
+#### a minimal puppet config regardless of host-local
+#### changes or errors.
+####
+<% end %>
######################################################################
[main]
@@ -12,10 +19,14 @@
[agent]
server = <%= @server %>
+<% if @puppetbasics %>
+certname = <%= @puppetbasics %>
+<% else %>
<% if @certname %>certname = <%= @certname %><% end %>
+splay = true
+<% end %>
configtimeout = 960
usecacheonfailure = false
-splay = true
prerun_command = /etc/puppet/etckeeper-commit-pre
postrun_command = /etc/puppet/etckeeper-commit-post
pluginsync = true
--
To view, visit https://gerrit.wikimedia.org/r/221563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I642ba771fb1197579d1a6de634efde55f5f28fda
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
