Dzahn has submitted this change and it was merged.

Change subject: silver: Use the role keyword
......................................................................


silver: Use the role keyword

We need this for Hiera-based assignment of Salt grains for debdeploy

Change-Id: Iadac9738eb26b6c87b76e23528ff82d228ce832e
---
M manifests/site.pp
1 file changed, 1 insertion(+), 3 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 7f952d7..2c4fe4b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2338,11 +2338,9 @@
 
 # Silver is the new home of the wikitech web server.
 node 'silver.wikimedia.org' {
+    role nova::manager, mariadb::wikitech
     include base::firewall
-
     include standard
-    include role::nova::manager
-    include role::mariadb::wikitech
 
     interface::add_ip6_mapped { 'main': }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iadac9738eb26b6c87b76e23528ff82d228ce832e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to