Volans has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/389983 )
Change subject: cumin: use new syntax in aliases
......................................................................
cumin: use new syntax in aliases
* Use the new and more compact syntax for roles and profiles in the
aliases file.
Change-Id: I4922d5373419283d3606c156ce1d0cebb860880b
---
M modules/profile/templates/cumin/aliases.yaml.erb
1 file changed, 99 insertions(+), 99 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/389983/1
diff --git a/modules/profile/templates/cumin/aliases.yaml.erb
b/modules/profile/templates/cumin/aliases.yaml.erb
index d6e8b53..a74c17d 100644
--- a/modules/profile/templates/cumin/aliases.yaml.erb
+++ b/modules/profile/templates/cumin/aliases.yaml.erb
@@ -1,200 +1,200 @@
all: P{*}
# Sites
<% @datacenters.each do |dc| -%>
-<%= dc %>: P{R:class = profile::cumin::target and R:class%site = <%= dc %>}
+<%= dc %>: P{P:cumin::target%site = <%= dc %>}
<% end -%>
# Server group definitions
all-mw-codfw: (A:mw-videoscaler or A:mw-imagescaler or A:mw-api or A:mw or
A:mw-jobrunner) and A:codfw
all-mw-eqiad: (A:mw-videoscaler or A:mw-imagescaler or A:mw-api or A:mw or
A:mw-jobrunner) and A:eqiad
-aqs: P{R:class = role::aqs}
+aqs: P{O:aqs}
aqs-canary: P{aqs1004.eqiad.wmnet}
-bastion: P{R:class = role::bastionhost::general or R:class =
role::bastionhost::twofa}
+bastion: P{O:bastionhost::general or O:bastionhost::twofa}
bastion-canary: P{bast4001.wikimedia.org}
-conf: P{R:class = role::configcluster}
+conf: P{O:configcluster}
conf-canary: P{conf2001.codfw.wmnet}
conf-codfw: A:conf and A:codfw
conf-eqiad: A:conf and A:eqiad
-contint: P{R:class = role::ci::master}
-cp: P{R:class = role::cache::misc or R:class = role::cache::upload or R:class
= role::cache::text}
-cp-canary: P{R:class = role::cache::canary}
+contint: P{O:ci::master}
+cp: P{O:cache::misc or O:cache::upload or O:cache::text}
+cp-canary: P{O:cache::canary}
cp-codfw: A:cp and A:codfw
cp-eqiad: A:cp and A:eqiad
cp-esams: A:cp and A:esams
cp-ulsfo: A:cp and A:ulsfo
<% [ 'text', 'upload', 'misc' ].each do |cache| -%>
-cp-<%= cache %>: P{R:class = role::cache::<%= cache %>}
+cp-<%= cache %>: P{O:cache::<%= cache %>}
<% @datacenters.each do |dc| -%>
cp-<%= cache %>_<%= dc %>: A:cp-<%= cache %> and A:<%= dc %>
<% end -%>
<% end -%>
-cumin: P{R:class = role::cluster::management}
+cumin: P{O:cluster::management}
db-all-codfw: (A:db-parsercache or A:db-labsdb or A:db-dbstore or A:db-core or
A:db-misc-servers) and A:codfw
db-all-eqiad: (A:db-parsercache or A:db-labsdb or A:db-dbstore or A:db-core or
A:db-misc-servers) and A:eqiad
-db-core: P{R:class = role::mariadb::core or R:class = role::mariadb::misc or
R:class = role::mariadb::misc::phabricator or R:class =
role::mariadb::misc::eventlogging}
+db-core: P{O:mariadb::core or O:mariadb::misc or O:mariadb::misc::phabricator
or O:mariadb::misc::eventlogging}
db-core-codfw: A:db-core and A:codfw
db-core-eqiad: A:db-core and A:eqiad
-db-dbproxy: P{R:class = role::mariadb::proxy::master}
-db-dbstore: P{R:class = role::mariadb::backup or R:class =
role::mariadb::dbstore or R:class = role::mariadb::dbstore_multiinstance}
-db-labsdb: P{R:class = role::labs::db::replica}
-db-misc-servers: P{R:class = role::mariadb::labs_deprecated or R:class =
role::mariadb::sanitarium_multisource or R:class =
role::mariadb::sanitarium_multiinstance}
-db-parsercache: P{R:class = role::mariadb::parsercache}
-dbmonitor: P{R:class = role::tendril}
-debugproxy: P{R:class = role::debug_proxy}
-deployment-servers: P{R:class = role::deployment_server}
-dns-auth: P{R:class = role::authdns::server}
+db-dbproxy: P{O:mariadb::proxy::master}
+db-dbstore: P{O:mariadb::backup or O:mariadb::dbstore or
O:mariadb::dbstore_multiinstance}
+db-labsdb: P{O:labs::db::replica}
+db-misc-servers: P{O:mariadb::labs_deprecated or
O:mariadb::sanitarium_multisource or O:mariadb::sanitarium_multiinstance}
+db-parsercache: P{O:mariadb::parsercache}
+dbmonitor: P{O:tendril}
+debugproxy: P{O:debug_proxy}
+deployment-servers: P{O:deployment_server}
+dns-auth: P{O:authdns::server}
dns-auth-canary: P{eeden.wikimedia.org}
-dns-rec: P{R:class = role::dnsrecursor}
+dns-rec: P{O:dnsrecursor}
dns-rec-canary: P{hydrogen.wikimedia.org}
-druid: P{R:class = role::druid::analytics::worker}
-dumps: P{R:class = role::dumps::server or R:class = role::dumpsdata or R:class
= role::dumps::zim}
-elastic: P{R:class = role::elasticsearch::cirrus}
+druid: P{O:druid::analytics::worker}
+dumps: P{O:dumps::server or O:dumpsdata or O:dumps::zim}
+elastic: P{O:elasticsearch::cirrus}
elastic-canary: P{elastic1017.eqiad.wmnet}
elastic-codfw: A:elastic and A:codfw
elastic-eqiad: A:elastic and A:eqiad
-eventlogging: P{R:class = role::eventlogging::analytics::processor}
-failoid: P{R:class = role::failoid}
-ganeti: P{R:class = role::ganeti}
+eventlogging: P{O:eventlogging::analytics::processor}
+failoid: P{O:failoid}
+ganeti: P{O:ganeti}
ganeti-canary: P{ganeti2001.codfw.wmnet}
ganeti-codfw: A:ganeti and A:codfw
ganeti-eqiad: A:ganeti and A:eqiad
-gerrit: P{R:class = role::gerrit::server}
-graphite: P{R:class = role::graphite::production or R:class =
role::labs::graphite}
+gerrit: P{O:gerrit::server}
+graphite: P{O:graphite::production or O:labs::graphite}
hadoop: A:hadoop-worker or A:hadoop-master or A:hadoop-standby
-hadoop-master: P{R:class = role::analytics_cluster::hadoop::master}
-hadoop-standby: P{R:class = role::analytics_cluster::hadoop::standby}
-hadoop-worker: P{R:class = role::analytics_cluster::hadoop::worker}
+hadoop-master: P{O:analytics_cluster::hadoop::master}
+hadoop-standby: P{O:analytics_cluster::hadoop::standby}
+hadoop-worker: P{O:analytics_cluster::hadoop::worker}
hadoop-worker-canary: P{analytics1030.eqiad.wmnet}
-icinga: P{R:class = role::icinga}
-installserver: P{R:class = role::installserver::http}
+icinga: P{O:icinga}
+installserver: P{O:installserver::http}
jobqueue-redis-codfw: (A:jobqueue-redis-master or A:jobqueue-redis-slave) and
A:codfw
jobqueue-redis-eqiad: (A:jobqueue-redis-master or A:jobqueue-redis-slave) and
A:eqiad
-jobqueue-redis-master: P{R:class = role::jobqueue_redis::master}
-jobqueue-redis-slave: P{R:class = role::jobqueue_redis::slave}
+jobqueue-redis-master: P{O:jobqueue_redis::master}
+jobqueue-redis-slave: P{O:jobqueue_redis::slave}
kafka-all: A:kafka-analytics or A:kafka-main or A:kafka-jumbo-canary
-kafka-analytics: P{R:class = role::kafka::analytics::broker}
+kafka-analytics: P{O:kafka::analytics::broker}
kafka-analytics-canary: P{kafka1012.eqiad.wmnet}
-kafka-main: P{R:class = role::kafka::main::broker}
+kafka-main: P{O:kafka::main::broker}
kafka-main-canary: P{kafka2001.codfw.wmnet}
kafka-main-codfw: A:kafka-main and A:codfw
kafka-main-eqiad: A:kafka-main and A:eqiad
kafka-jumbo-canary: P{kafka-jumbo1001.eqiad.wmnet}
-kafka-jumbo: P{R:class = role::kafka::jumbo::broker}
-kubernetes-etcd: P{R:class = role::etcd::kubernetes}
-kubernetes-masters: P{R:class = role::kubernetes::master}
-kubernetes-staging: P{R:class = role::kubernetes::staging::etcd or R:class =
role::kubernetes::staging::master or R:class =
role::kubernetes::staging::worker}
-kubernetes-workers: P{R:class = role::kubernetes::worker}
+kafka-jumbo: P{O:kafka::jumbo::broker}
+kubernetes-etcd: P{O:etcd::kubernetes}
+kubernetes-masters: P{O:kubernetes::master}
+kubernetes-staging: P{O:kubernetes::staging::etcd or
O:kubernetes::staging::master or O:kubernetes::staging::worker}
+kubernetes-workers: P{O:kubernetes::worker}
kubernetes-all: A:kubernetes-etcd or A:kubernetes-masters or
A:kubernetes-staging or A:kubernetes-workers
-labcontrol: P{R:class = role::wmcs::openstack::main::control}
-labnet: P{R:class = role::wmcs::openstack::main::net or R:class =
role::wmcs::openstack::main::net_secondary}
-labs-nfs: P{R:class = role::labs::nfs::secondary or R:class =
role::labs::nfs::secondary_backup::tools or R:class =
role::labs::nfs::secondary_backup::misc}
-labservices: P{R:class = role::wmcs::openstack::main::services}
-labtest: P{R:class = role::wmcs::openstack::labtestn::net or R:class =
role::wmcs::openstack::labtest::virt or R:class =
role::wmcs::openstack::labtest::net or R:class =
role::wmcs::openstack::labtest::control or R:class =
role::wmcs::openstack::labtestn::control or R:class =
role::wmcs::openstack::labtest::services or R:class =
role::wmcs::openstack::labtestn::services}
-labvirt: P{R:class = role::wmcs::openstack::main::virt}
+labcontrol: P{O:wmcs::openstack::main::control}
+labnet: P{O:wmcs::openstack::main::net or
O:wmcs::openstack::main::net_secondary}
+labs-nfs: P{O:labs::nfs::secondary or O:labs::nfs::secondary_backup::tools or
O:labs::nfs::secondary_backup::misc}
+labservices: P{O:wmcs::openstack::main::services}
+labtest: P{O:wmcs::openstack::labtestn::net or
O:wmcs::openstack::labtest::virt or O:wmcs::openstack::labtest::net or
O:wmcs::openstack::labtest::control or O:wmcs::openstack::labtestn::control or
O:wmcs::openstack::labtest::services or O:wmcs::openstack::labtestn::services}
+labvirt: P{O:wmcs::openstack::main::virt}
labvirt-canary: P{labvirt1001.eqiad.wmnet}
-labweb: P{R:class = role::wmcs::openstack::main::web or R:class =
role::wmcs::openstack::main::wikitech or R:class =
role::wmcs::openstack::main::horizon}
-logstash: P{R:class = role::logstash::collector or R:class =
role::logstash::elasticsearch}
+labweb: P{O:wmcs::openstack::main::web or O:wmcs::openstack::main::wikitech or
O:wmcs::openstack::main::horizon}
+logstash: P{O:logstash::collector or O:logstash::elasticsearch}
logstash-canary: P{logstash1007.eqiad.wmnet}
-lvs: P{R:class = role::lvs::balancer}
+lvs: P{O:lvs::balancer}
lvs-canary: P{lvs4001.ulsfo.wmnet}
lvs-codfw: A:lvs and A:codfw
lvs-eqiad: A:lvs and A:eqiad
lvs-esams: A:lvs and A:esams
lvs-ulsfo: A:lvs and A:ulsfo
-maps: P{R:class = role::maps::master or R:class = role::maps::slave or R:class
= role::maps::test::slave or R:class = role::maps::test::master}
+maps: P{O:maps::master or O:maps::slave or O:maps::test::slave or
O:maps::test::master}
maps-canary: P{maps1001.eqiad.wmnet}
-maps-test: P{R:class = role::maps::test::master or R:class =
role::maps::test::slave}
-memcached: P{R:class = role::mediawiki::memcached}
+maps-test: P{O:maps::test::master or O:maps::test::slave}
+memcached: P{O:mediawiki::memcached}
memcached-canary: P{mc1019.eqiad.wmnet}
memcached-codfw: A:memcached and A:codfw
memcached-eqiad: A:memcached and A:eqiad
-mw: P{R:class = role::mediawiki::appserver}
-mw-api: P{R:class = role::mediawiki::appserver::api}
-mw-api-canary: P{R:class = role::mediawiki::appserver::canary_api}
+mw: P{O:mediawiki::appserver}
+mw-api: P{O:mediawiki::appserver::api}
+mw-api-canary: P{O:mediawiki::appserver::canary_api}
mw-api-codfw: A:mw-api and A:codfw
mw-api-eqiad: A:mw-api and A:eqiad
-mw-canary: P{R:class = role::mediawiki::canary_appserver}
+mw-canary: P{O:mediawiki::canary_appserver}
mw-codfw: A:mw and A:codfw
mw-eqiad: A:mw and A:eqiad
-mw-imagescaler: P{R:class = role::mediawiki::imagescaler}
+mw-imagescaler: P{O:mediawiki::imagescaler}
mw-imagescaler-canary: P{mw1293.eqiad.wmnet}
mw-imagescaler-codfw: A:mw-imagescaler and A:codfw
mw-imagescaler-eqiad: A:mw-imagescaler and A:eqiad
-mw-jobrunner: P{R:class = role::mediawiki::jobrunner}
+mw-jobrunner: P{O:mediawiki::jobrunner}
mw-jobrunner-canary: P{mw1311.eqiad.wmnet}
mw-jobrunner-codfw: A:mw-jobrunner and A:codfw
mw-jobrunner-eqiad: A:mw-jobrunner and A:eqiad
-mw-maintenance: P{R:class = role::mediawiki_maintenance}
-mw-videoscaler: P{R:class = role::mediawiki::videoscaler}
+mw-maintenance: P{O:mediawiki_maintenance}
+mw-videoscaler: P{O:mediawiki::videoscaler}
mw-videoscaler-canary: P{mw1168.eqiad.wmnet}
mw-videoscaler-codfw: A:mw-videoscaler and A:codfw
mw-videoscaler-eqiad: A:mw-videoscaler and A:eqiad
-mwlog: P{R:class = role::xenon}
-mx: P{R:class = role::mail::mx}
+mwlog: P{O:xenon}
+mx: P{O:mail::mx}
mx-canary: P{mx2001.wikimedia.org}
-netmon: P{R:class = role::network::monitor}
-notebook: P{R:class = role::paws_internal::jupyterhub}
+netmon: P{O:network::monitor}
+notebook: P{O:paws_internal::jupyterhub}
ocg: P{ocg*}
-openldap: P{R:class = role::openldap::corp or R:class = role::openldap::labs}
+openldap: P{O:openldap::corp or O:openldap::labs}
openldap-canary: P{dubnium.wikimedia.org}
-oresrdb: P{R:class = role::ores::redis}
+oresrdb: P{O:ores::redis}
oresrdb-codfw: A:oresrdb and A:codfw
oresrdb-eqiad: A:oresrdb and A:eqiad
osm: A:osm-master or A:osm-slave
-osm-master: P{R:class = role::osm::master}
-osm-slave: P{R:class = role::osm::slave}
-parsoid: P{R:class = role::parsoid}
+osm-master: P{O:osm::master}
+osm-slave: P{O:osm::slave}
+parsoid: P{O:parsoid}
parsoid-canary: P{wtp1025.eqiad.wmnet}
parsoid-codfw: A:parsoid and A:codfw
parsoid-eqiad: A:parsoid and A:eqiad
-planet: P{R:class = role::planet_server}
-poolcounter: P{R:class = role::poolcounter::server}
+planet: P{O:planet_server}
+poolcounter: P{O:poolcounter::server}
poolcounter-codfw: A:poolcounter and A:codfw
poolcounter-eqiad: A:poolcounter and A:eqiad
-prometheus: P{R:class = role::prometheus::ops}
-puppetdb: P{R:class = role::puppetmaster::puppetdb}
+prometheus: P{O:prometheus::ops}
+puppetdb: P{O:puppetmaster::puppetdb}
puppetmaster: A:puppetmaster-backend or A:puppetmaster-frontend
-puppetmaster-backend: P{R:class = role::puppetmaster::backend}
-puppetmaster-frontend: P{R:class = role::puppetmaster::frontend}
-relforge: P{R:class = role::elasticsearch::relforge}
-restbase: P{R:class = role::restbase::production or R:class =
role::restbase::production_ng}
-restbase-ng: P{R:class = role::restbase::production_ng}
+puppetmaster-backend: P{O:puppetmaster::backend}
+puppetmaster-frontend: P{O:puppetmaster::frontend}
+relforge: P{O:elasticsearch::relforge}
+restbase: P{O:restbase::production or O:restbase::production_ng}
+restbase-ng: P{O:restbase::production_ng}
restbase-canary: P{restbase1007.eqiad.wmnet}
restbase-codfw: A:restbase and A:codfw
restbase-eqiad: A:restbase and A:eqiad
-restbase-test: P{R:class = role::restbase::test_cluster or R:class =
role::restbase::dev_cluster}
-sca: P{R:class = role::sca}
+restbase-test: P{O:restbase::test_cluster or O:restbase::dev_cluster}
+sca: P{O:sca}
sca-canary: P{sca1003.eqiad.wmnet}
-scb: P{R:class = role::scb}
+scb: P{O:scb}
scb-canary: P{scb1001.eqiad.wmnet}
scb-codfw: A:scb and A:codfw
scb-eqiad: A:scb and A:eqiad
-snapshot: P{R:class = role::snapshot::dumper} or A:snapshot-canary
-snapshot-canary: P{R:class = role::snapshot::testbed}
-stat: P{R:class = role::statistics::private or R:class =
role::statistics::cruncher or R:class = role::analytics_cluster::client}
+snapshot: P{O:snapshot::dumper} or A:snapshot-canary
+snapshot-canary: P{O:snapshot::testbed}
+stat: P{O:statistics::private or O:statistics::cruncher or
O:analytics_cluster::client}
swift: A:swift-fe or A:swift-be
-swift-be: P{R:class = role::swift::storage}
+swift-be: P{O:swift::storage}
swift-be-canary: P{ms-be1013.eqiad.wmnet}
swift-be-codfw: A:swift-be and A:codfw
swift-be-eqiad: A:swift-be and A:eqiad
-swift-fe: P{R:class = role::swift::proxy}
+swift-fe: P{O:swift::proxy}
swift-fe-canary: P{ms-fe1005.eqiad.wmnet}
swift-fe-codfw: A:swift-fe and A:codfw
swift-fe-eqiad: A:swift-fe and A:eqiad
-thumbor: P{R:class = role::thumbor::mediawiki}
+thumbor: P{O:thumbor::mediawiki}
thumbor-codfw: A:thumbor and A:codfw
thumbor-eqiad: A:thumbor and A:eqiad
-url-downloader: P{R:class = role::url_downloader}
-wdqs: P{R:class = role::wdqs}
+url-downloader: P{O:url_downloader}
+wdqs: P{O:wdqs}
wdqs-canary: P{wdqs1003.eqiad.wmnet}
-yubiauth: P{R:class = role::yubiauth_server}
+yubiauth: P{O:yubiauth_server}
# Miscellaneous groups
-misc-analytics: P{R:class = role::statistics::web or R:class =
role::piwik::server} or A:eventlogging
-misc-apache: P{R:class = role::microsites::peopleweb or R:class =
grafana::production or R:class = role::requesttracker_server or R:class =
role::releases or R:class = role::otrs} or A:planet
-misc-devel: P{R:class = role::webperf or R:class = role::ve or R:class =
role::archiva} or A:debugproxy or A:mwlog
-misc-nonprod: P{R:class = role::spare::system or R:class = role::test or
R:class = role::security::tools or R:class = role::pybaltest}
-misc-ops: A:installserver or A:cumin or A:url-downloader or A:icinga or
P{R:class = role::logging::kafkatee::webrequest::ops or R:class = role::builder
or R:class = role::syslog::centralserver or R:class = role::pmacct or R:class =
role::backup::offsite or R:class = role::backup} or A:netmon
-misc-others: P{R:class = role::mw_rc_irc or R:class = role::etherpad or
R:class = role::tor_relay or R:class = role::lists}
-misc-releng: P{R:class = role::labs::openstack::nodepool or R:class =
role::phabricator_server} or A:contint or A:gerrit
+misc-analytics: P{O:statistics::web or O:piwik::server} or A:eventlogging
+misc-apache: P{O:microsites::peopleweb or C:grafana::production or
O:requesttracker_server or O:releases or O:otrs} or A:planet
+misc-devel: P{O:webperf or O:ve or O:archiva} or A:debugproxy or A:mwlog
+misc-nonprod: P{O:spare::system or O:test or O:security::tools or O:pybaltest}
+misc-ops: A:installserver or A:cumin or A:url-downloader or A:icinga or
P{O:logging::kafkatee::webrequest::ops or O:builder or O:syslog::centralserver
or O:pmacct or O:backup::offsite or O:backup} or A:netmon
+misc-others: P{O:mw_rc_irc or O:etherpad or O:tor_relay or O:lists}
+misc-releng: P{O:labs::openstack::nodepool or O:phabricator_server} or
A:contint or A:gerrit
misc-wmcs: A:labnet or A:labcontrol or A:labservices or A:labweb
--
To view, visit https://gerrit.wikimedia.org/r/389983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4922d5373419283d3606c156ce1d0cebb860880b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
