Andrew Bogott has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/328451 )
Change subject: Tools: Fully qualify hostnames ...................................................................... Tools: Fully qualify hostnames This change fully qualifies some hostnames in the "flat" namespace beneath .eqiad.wmflabs. Hostnames should only refer to the project-specific instance, i. e. beneath .tools.eqiad.wmflabs. This is most obvious in the case of role::toollabs::services: Here the parameter $active_host was tested for equality with $::fqdn. However, due to $active_host being "tools-services-01.eqiad.wmflabs" and $::fqdn being "tools-services-01.tools.eqiad.wmflabs", this would have failed if $active_host had not been overwritten at https://wikitech.wikimedia.org/wiki/Hiera:Tools. An exception to this rule are modules/toollabs/files/host_aliases and modules/toollabs/templates/mail-relay.exim4.conf.erb that need to list legacy hostnames. Bug: T153608 Change-Id: I6888bb449bd59bf4c522e3b14d6a38dc2540decd --- M hieradata/labs/tools/common.yaml M modules/role/manifests/toollabs/services.pp M modules/toollabs/files/exec-manage M modules/toollabs/manifests/init.pp 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/labs/tools/common.yaml b/hieradata/labs/tools/common.yaml index 24c35d4..c62e87a 100644 --- a/hieradata/labs/tools/common.yaml +++ b/hieradata/labs/tools/common.yaml @@ -1,7 +1,7 @@ "profile::base::core_dump_pattern": core classes: - role::aptly::client -role::aptly::client::servername: tools-services-01 +role::aptly::client::servername: tools-services-01.tools.eqiad.wmflabs standard::has_default_mail_relay: false k8s_regular_users: - lolrrit-wm diff --git a/modules/role/manifests/toollabs/services.pp b/modules/role/manifests/toollabs/services.pp index 046eb14..068bbf3 100644 --- a/modules/role/manifests/toollabs/services.pp +++ b/modules/role/manifests/toollabs/services.pp @@ -1,6 +1,6 @@ # filtertags: labs-project-tools class role::toollabs::services( - $active_host = 'tools-services-01.eqiad.wmflabs', + $active_host = 'tools-services-01.tools.eqiad.wmflabs', ) { system::role { 'role::toollabs::services': description => 'Tool Labs manifest based services', diff --git a/modules/toollabs/files/exec-manage b/modules/toollabs/files/exec-manage index 3eadaea..7a5fbd1 100644 --- a/modules/toollabs/files/exec-manage +++ b/modules/toollabs/files/exec-manage @@ -11,7 +11,7 @@ echo "exec-manage [status|depool|repool|test] exec_host_name" echo "exec-manage [list]" echo "" - echo "Example: exec-manage status tools-exec1001.eqiad.wmflabs " + echo "Example: exec-manage status tools-exec1001.tools.eqiad.wmflabs" } if [[ ! "$1" || "$1" == '-h' ]]; then diff --git a/modules/toollabs/manifests/init.pp b/modules/toollabs/manifests/init.pp index 3ef6e56..33a98b6 100644 --- a/modules/toollabs/manifests/init.pp +++ b/modules/toollabs/manifests/init.pp @@ -4,7 +4,7 @@ $external_hostname = undef, $external_ip = undef, $is_mail_relay = false, - $active_mail_relay = 'tools-mail.eqiad.wmflabs', + $active_mail_relay = 'tools-mail.tools.eqiad.wmflabs', $mail_domain = 'tools.wmflabs.org', ) { -- To view, visit https://gerrit.wikimedia.org/r/328451 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6888bb449bd59bf4c522e3b14d6a38dc2540decd Gerrit-PatchSet: 6 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de> Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: Chasemp <r...@wikimedia.org> Gerrit-Reviewer: Coren <m...@uberbox.org> Gerrit-Reviewer: Madhuvishy <mviswanat...@wikimedia.org> Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl> Gerrit-Reviewer: Tim Landscheidt <t...@tim-landscheidt.de> Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
