Andrew Bogott has submitted this change and it was merged.

Change subject: horizon: Show role::puppetmaster::standalone instead of 
role::puppet::self
......................................................................


horizon: Show role::puppetmaster::standalone instead of role::puppet::self

Death to the latter.

Bug: T120159
Change-Id: I861bb17fefcd187b45a606bcf25b211d92546684
---
M modules/role/manifests/puppet/self.pp
M modules/role/manifests/puppetmaster/standalone.pp
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/puppet/self.pp 
b/modules/role/manifests/puppet/self.pp
index f4cbcf6..f5ac3c6 100644
--- a/modules/role/manifests/puppet/self.pp
+++ b/modules/role/manifests/puppet/self.pp
@@ -9,8 +9,6 @@
 # $::puppetmaster must be set as a global variable.
 # This allows puppet classes to be configured via LDAP
 # and wikitech instance configuration.
-#
-# filtertags: labs-common
 class role::puppet::self(
     $master = $::puppetmaster,
     $autoupdate_master = true,
diff --git a/modules/role/manifests/puppetmaster/standalone.pp 
b/modules/role/manifests/puppetmaster/standalone.pp
index 6178177..4cd50db 100644
--- a/modules/role/manifests/puppetmaster/standalone.pp
+++ b/modules/role/manifests/puppetmaster/standalone.pp
@@ -32,6 +32,8 @@
 # [*server_name*]
 #  Hostname for the puppetmaster. Defaults to fqdn. Is used for SSL
 #  certificates, virtualhost routing, etc
+#
+# filtertags: labs-common
 class role::puppetmaster::standalone(
     $autosign = false,
     $prevent_cherrypicks = false,

-- 
To view, visit https://gerrit.wikimedia.org/r/315526
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I861bb17fefcd187b45a606bcf25b211d92546684
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to