Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/401549 )
Change subject: site.pp: use role keyword for striker::web only on californium
......................................................................
site.pp: use role keyword for striker::web only on californium
No hiera lookup is performed on the other role, so we can safely move it
out of the role() call.
Change-Id: I89f4090ba48e4bfbfc982be9662ec36c389e460c
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 7cd34b6..e0edbe8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -125,8 +125,8 @@
# and Toolforge admin console AKA Striker
# It's proxied by the misc-web varnishes
node 'californium.wikimedia.org' {
- role(wmcs::openstack::main::horizon,
- striker::web)
+ role(striker::web)
+ include ::role::wmcs::openstack::main::horizon
include ::standard
include ::base::firewall
include ::ldap::role::client::labs
--
To view, visit https://gerrit.wikimedia.org/r/401549
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I89f4090ba48e4bfbfc982be9662ec36c389e460c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[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
