Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/393709 )
Change subject: rename phabricator_server to just phabricator ...................................................................... rename phabricator_server to just phabricator Similar to gerrit we can also rename "phabricator_server" to just "phabricator". There were just historic reasons for that. Change-Id: I1293ef9eb9a779d80fbfb43df127677112d89d06 --- R hieradata/role/codfw/phabricator.yaml R hieradata/role/common/phabricator.yaml R hieradata/role/eqiad/phabricator.yaml M manifests/site.pp M modules/profile/templates/cumin/aliases.yaml.erb R modules/role/manifests/phabricator.pp 6 files changed, 4 insertions(+), 4 deletions(-) Approvals: 20after4: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/hieradata/role/codfw/phabricator_server.yaml b/hieradata/role/codfw/phabricator.yaml similarity index 100% rename from hieradata/role/codfw/phabricator_server.yaml rename to hieradata/role/codfw/phabricator.yaml diff --git a/hieradata/role/common/phabricator_server.yaml b/hieradata/role/common/phabricator.yaml similarity index 100% rename from hieradata/role/common/phabricator_server.yaml rename to hieradata/role/common/phabricator.yaml diff --git a/hieradata/role/eqiad/phabricator_server.yaml b/hieradata/role/eqiad/phabricator.yaml similarity index 100% rename from hieradata/role/eqiad/phabricator_server.yaml rename to hieradata/role/eqiad/phabricator.yaml diff --git a/manifests/site.pp b/manifests/site.pp index 0469cca..7b5cf80 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1046,7 +1046,7 @@ # Phabricator node /^(phab1001\.eqiad|phab2001\.codfw)\.wmnet$/ { - role(phabricator_server) + role(phabricator) interface::add_ip6_mapped { 'main': } } diff --git a/modules/profile/templates/cumin/aliases.yaml.erb b/modules/profile/templates/cumin/aliases.yaml.erb index 0f6323b..b6a9820 100644 --- a/modules/profile/templates/cumin/aliases.yaml.erb +++ b/modules/profile/templates/cumin/aliases.yaml.erb @@ -198,5 +198,5 @@ misc-nonprod: P{O:spare::system or O:test or O:pybaltest or O:restbase::test_cluster or O:authdns::testns or O:cache::canary} 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-releng: P{O:labs::openstack::nodepool or O:phabricator} or A:contint or A:gerrit misc-wmcs: A:labnet or A:labcontrol or A:labservices or A:labweb diff --git a/modules/role/manifests/phabricator_server.pp b/modules/role/manifests/phabricator.pp similarity index 84% rename from modules/role/manifests/phabricator_server.pp rename to modules/role/manifests/phabricator.pp index 6f15a33..6fc8e91 100644 --- a/modules/role/manifests/phabricator_server.pp +++ b/modules/role/manifests/phabricator.pp @@ -1,9 +1,9 @@ # phabricator instance # # filtertags: labs-project-deployment-prep labs-project-phabricator -class role::phabricator_server { +class role::phabricator { - system::role { 'phabricator_server': + system::role { 'phabricator': description => 'Phabricator (Main) Server' } -- To view, visit https://gerrit.wikimedia.org/r/393709 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1293ef9eb9a779d80fbfb43df127677112d89d06 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: 20after4 <mmod...@wikimedia.org> Gerrit-Reviewer: Chad <ch...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Volans <rcocci...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits