Giuseppe Lavagetto has submitted this change and it was merged. Change subject: services: create sca role ......................................................................
services: create sca role In the work for T86774 it seemed convenient to unify all the roles we apply to services cluster A in a single comprehensive role that we can configure properly. Change-Id: I7cd4b5d47eea62eea111c362aa70730e9c83a5af Signed-off-by: Giuseppe Lavagetto <[email protected]> --- A hieradata/role/sca.yaml A manifests/role/sca.pp M manifests/site.pp 3 files changed, 21 insertions(+), 22 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/sca.yaml b/hieradata/role/sca.yaml new file mode 100644 index 0000000..1f84489 --- /dev/null +++ b/hieradata/role/sca.yaml @@ -0,0 +1,12 @@ +cluster: sca +admin::groups: + - mathoid-roots + - mathoid-admin + - citoid-roots + - citoid-admin + - cxserver-admin + +lvs::realserver::realserver_ips: + - '10.2.2.18' # cxserver.svc.eqiad.wmnet + - '10.2.2.19' # citoid.svc.eqiad.wmnet + - '10.2.2.20' # mathoid.svc.eqiad.wmnet diff --git a/manifests/role/sca.pp b/manifests/role/sca.pp new file mode 100644 index 0000000..7d71f67 --- /dev/null +++ b/manifests/role/sca.pp @@ -0,0 +1,8 @@ +# "Compendium" class for nodes supporting various parsoid services +class role::sca { + include role::apertium, role::citoid, role::cxserver, role::mathoid + include standard + include admin + include lvs::realserver + include base::firewall +} diff --git a/manifests/site.pp b/manifests/site.pp index f88aa31..eca4d79 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2627,29 +2627,8 @@ } node /^sca100[12]\.eqiad\.wmnet$/ { - $cluster = 'sca' $ganglia_aggregator = true - include standard - include base::firewall - - role apertium, citoid, cxserver, mathoid - - class { 'admin': - groups => [ - 'mathoid-roots', - 'mathoid-admin', - 'citoid-roots', - 'citoid-admin', - 'cxserver-admin', - ] - } - class { 'lvs::realserver': - realserver_ips => [ - '10.2.2.18', # cxserver.svc.eqiad.wmnet - '10.2.2.19', # citoid.svc.eqiad.wmnet - '10.2.2.20', # mathoid.svc.eqiad.wmnet - ], - } + role sca } node 'uranium.wikimedia.org' { -- To view, visit https://gerrit.wikimedia.org/r/185154 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7cd4b5d47eea62eea111c362aa70730e9c83a5af Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Alexandros Kosiaris <[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
