Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/230966
Change subject: deployment: include admin roles in role, not nodes ...................................................................... deployment: include admin roles in role, not nodes After Id6a9ccead34904e4ec6ad we should be able to use role-based lookup in hiera data here, and keep the admin group config for deployment servers in one place, rather than on the node level. < Krenair> mutante, in the spirit of https://gerrit.wikimedia.org/r/#/c/223458/5 - is there a way to keep hieradata\/hosts\/(tin|mira)\.yaml in the same place? Change-Id: If181ca81ccf04b5e2ba8349906fce51f286b714a --- M hieradata/hosts/mira.yaml M hieradata/hosts/tin.yaml A hieradata/role/common/deployment/server.yaml 3 files changed, 5 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/66/230966/1 diff --git a/hieradata/hosts/mira.yaml b/hieradata/hosts/mira.yaml index c8baf0a..ce94ea1 100644 --- a/hieradata/hosts/mira.yaml +++ b/hieradata/hosts/mira.yaml @@ -3,10 +3,5 @@ - codfw.wmnet - eqiad.wmnet - esams.wikimedia.org -admin::groups: - - deployment - - parsoid-admin - - ocg-render-admins - - wdqs-admins cluster: misc scap::l10nupdate::run_l10nupdate: false diff --git a/hieradata/hosts/tin.yaml b/hieradata/hosts/tin.yaml index 71b61c0..638589a 100644 --- a/hieradata/hosts/tin.yaml +++ b/hieradata/hosts/tin.yaml @@ -3,10 +3,5 @@ - eqiad.wmnet - esams.wikimedia.org - codfw.wmnet -admin::groups: - - deployment - - parsoid-admin - - ocg-render-admins - - wdqs-admins cluster: misc scap::l10nupdate::run_l10nupdate: true diff --git a/hieradata/role/common/deployment/server.yaml b/hieradata/role/common/deployment/server.yaml new file mode 100644 index 0000000..eb26f28 --- /dev/null +++ b/hieradata/role/common/deployment/server.yaml @@ -0,0 +1,5 @@ +admin::groups: + - deployment + - parsoid-admin + - ocg-render-admins + - wdqs-admins -- To view, visit https://gerrit.wikimedia.org/r/230966 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If181ca81ccf04b5e2ba8349906fce51f286b714a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
