Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393678 )
Change subject: puppetmaster::standalone: include environment env
......................................................................
puppetmaster::standalone: include environment env
We need this in order for the transition to puppet v4 to work
properly.
Change-Id: Iefcd2c3e7977400f08fb8caca49c788ab9ff397e
---
M modules/role/manifests/puppetmaster/standalone.pp
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, but someone else must approve
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/puppetmaster/standalone.pp
b/modules/role/manifests/puppetmaster/standalone.pp
index 2b89432..e113a47 100644
--- a/modules/role/manifests/puppetmaster/standalone.pp
+++ b/modules/role/manifests/puppetmaster/standalone.pp
@@ -61,6 +61,8 @@
'external_nodes' => '/usr/local/bin/puppet-enc',
'thin_storeconfigs' => false,
'autosign' => $autosign,
+ 'environmentpath' => '$confdir/environments',
+ 'default_manifest' => '$confdir/manifests/site.pp'
}
class { '::puppetmaster':
--
To view, visit https://gerrit.wikimedia.org/r/393678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iefcd2c3e7977400f08fb8caca49c788ab9ff397e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
