Dzahn has submitted this change and it was merged. Change subject: deployment servers: use role keyword for role ......................................................................
deployment servers: use role keyword for role Use the role keyword to include the role instead of a regular include because then we can use role-based lookup in hiera data and put stuff like admin groups in one central place in role/common/ see: https://wikitech.wikimedia.org/wiki/Puppet_Hiera#Role-based_lookup Change-Id: Id6a9ccead34904e4ec6ad07f5c99df2f2e387383 --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/site.pp b/manifests/site.pp index f8a8cff..cde4637 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1700,9 +1700,9 @@ # codfw deployment host (pending set up) node 'mira.codfw.wmnet' { + role deployment::server include standard include base::firewall - include role::deployment::server include role::labsdb::manager include role::releases::upload @@ -2306,8 +2306,8 @@ node 'tin.eqiad.wmnet' { + role deployment::server include standard - include role::deployment::server include role::labsdb::manager interface::add_ip6_mapped { 'main': -- To view, visit https://gerrit.wikimedia.org/r/230965 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id6a9ccead34904e4ec6ad07f5c99df2f2e387383 Gerrit-PatchSet: 8 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <[email protected]> Gerrit-Reviewer: Alex Monk <[email protected]> Gerrit-Reviewer: BryanDavis <[email protected]> Gerrit-Reviewer: Dzahn <[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
