Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/393710 )
Change subject: rename planet_server to just planet ...................................................................... rename planet_server to just planet Change-Id: I88e3fcb0205e1f1d99afae86627cc81e7a2e2a5a --- R hieradata/role/common/planet.yaml M manifests/site.pp M modules/profile/templates/cumin/aliases.yaml.erb R modules/role/manifests/planet.pp 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/hieradata/role/common/planet_server.yaml b/hieradata/role/common/planet.yaml similarity index 100% rename from hieradata/role/common/planet_server.yaml rename to hieradata/role/common/planet.yaml diff --git a/manifests/site.pp b/manifests/site.pp index 020e122..0469cca 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1792,7 +1792,7 @@ # virtual machines hosting https://wikitech.wikimedia.org/wiki/Planet.wikimedia.org node /^planet[12]001\.(eqiad|codfw)\.wmnet$/ { - role(planet_server) + role(planet) interface::add_ip6_mapped { 'main': } } diff --git a/modules/profile/templates/cumin/aliases.yaml.erb b/modules/profile/templates/cumin/aliases.yaml.erb index fb60525..0f6323b 100644 --- a/modules/profile/templates/cumin/aliases.yaml.erb +++ b/modules/profile/templates/cumin/aliases.yaml.erb @@ -149,7 +149,7 @@ parsoid-canary: P{wtp1025.eqiad.wmnet} parsoid-codfw: A:parsoid and A:codfw parsoid-eqiad: A:parsoid and A:eqiad -planet: P{O:planet_server} +planet: P{O:planet} poolcounter: P{O:poolcounter::server} poolcounter-codfw: A:poolcounter and A:codfw poolcounter-eqiad: A:poolcounter and A:eqiad diff --git a/modules/role/manifests/planet_server.pp b/modules/role/manifests/planet.pp similarity index 77% rename from modules/role/manifests/planet_server.pp rename to modules/role/manifests/planet.pp index a5fc707..c7c0ee3 100644 --- a/modules/role/manifests/planet_server.pp +++ b/modules/role/manifests/planet.pp @@ -1,11 +1,11 @@ # server running a planet RSS feed aggregator -class role::planet_server { +class role::planet { include ::standard include ::profile::base::firewall include ::profile::planet::venus - system::role { 'planet_server': + system::role { 'planet': description => 'Planet-venus or rawdog RSS feed aggregator' } } -- To view, visit https://gerrit.wikimedia.org/r/393710 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I88e3fcb0205e1f1d99afae86627cc81e7a2e2a5a Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com> 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