Dzahn has submitted this change and it was merged.
Change subject: puppetmaster: Fix whitespace error
..
puppetmaster: Fix whitespace error
Fixes ERROR: trailing whitespace found on line 11
Change-Id: Ic6d59597d7556098faa7695bf51295f3659528fc
---
M modules/puppetmaster/manifests/config.pp
M modules/role/manifests/puppetmaster/backend.pp
2 files changed, 1 insertion(+), 2 deletions(-)
Approvals:
Dzahn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppetmaster/manifests/config.pp
b/modules/puppetmaster/manifests/config.pp
index 70d56e2..2d70129 100644
--- a/modules/puppetmaster/manifests/config.pp
+++ b/modules/puppetmaster/manifests/config.pp
@@ -8,7 +8,7 @@
) {
$is_37_plus = versioncmp($::puppetversion, '3.7')
-
+
base::puppet::config { 'master':
prio=> 20,
content => template('puppetmaster/master.conf.erb'),
diff --git a/modules/role/manifests/puppetmaster/backend.pp
b/modules/role/manifests/puppetmaster/backend.pp
index 0af47b5..6846db0 100644
--- a/modules/role/manifests/puppetmaster/backend.pp
+++ b/modules/role/manifests/puppetmaster/backend.pp
@@ -16,7 +16,6 @@
}
}
-
class { '::puppetmaster':
server_type => 'backend',
config => $::role::puppetmaster::common::config
--
To view, visit https://gerrit.wikimedia.org/r/310672
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6d59597d7556098faa7695bf51295f3659528fc
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits