coren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/215918
Change subject: Tool Labs: add old-style fqdn aliases to nodes
......................................................................
Tool Labs: add old-style fqdn aliases to nodes
So that gridengine does not get confused by the new instance
naming scheme. New nodes do not need to be added to this list
since they will be configured within gridengine with the proper
(new) name.
Bug: T101296
Change-Id: Idbdc4954e6b26185f92995aef035edae15220eb7
---
A modules/toollabs/files/host_aliases
M modules/toollabs/manifests/master.pp
2 files changed, 130 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/18/215918/1
diff --git a/modules/toollabs/files/host_aliases
b/modules/toollabs/files/host_aliases
new file mode 100644
index 0000000..f1655cf
--- /dev/null
+++ b/modules/toollabs/files/host_aliases
@@ -0,0 +1,118 @@
+tools-bastion-01.eqiad.wmflabs tools-bastion-01.tools.eqiad.wmflabs
+tools-bastion-02.eqiad.wmflabs tools-bastion-02.tools.eqiad.wmflabs
+tools-checker-01.eqiad.wmflabs tools-checker-01.tools.eqiad.wmflabs
+tools-checker-02.eqiad.wmflabs tools-checker-02.tools.eqiad.wmflabs
+tools-dev.eqiad.wmflabs tools-dev.tools.eqiad.wmflabs
+tools-exec-01.eqiad.wmflabs tools-exec-01.tools.eqiad.wmflabs
+tools-exec-02.eqiad.wmflabs tools-exec-02.tools.eqiad.wmflabs
+tools-exec-03.eqiad.wmflabs tools-exec-03.tools.eqiad.wmflabs
+tools-exec-04.eqiad.wmflabs tools-exec-04.tools.eqiad.wmflabs
+tools-exec-05.eqiad.wmflabs tools-exec-05.tools.eqiad.wmflabs
+tools-exec-06.eqiad.wmflabs tools-exec-06.tools.eqiad.wmflabs
+tools-exec-07.eqiad.wmflabs tools-exec-07.tools.eqiad.wmflabs
+tools-exec-08.eqiad.wmflabs tools-exec-08.tools.eqiad.wmflabs
+tools-exec-09.eqiad.wmflabs tools-exec-09.tools.eqiad.wmflabs
+tools-exec-10.eqiad.wmflabs tools-exec-10.tools.eqiad.wmflabs
+tools-exec-11.eqiad.wmflabs tools-exec-11.tools.eqiad.wmflabs
+tools-exec-1201.eqiad.wmflabs tools-exec-1201.tools.eqiad.wmflabs
+tools-exec-1202.eqiad.wmflabs tools-exec-1202.tools.eqiad.wmflabs
+tools-exec-1203.eqiad.wmflabs tools-exec-1203.tools.eqiad.wmflabs
+tools-exec-1204.eqiad.wmflabs tools-exec-1204.tools.eqiad.wmflabs
+tools-exec-1205.eqiad.wmflabs tools-exec-1205.tools.eqiad.wmflabs
+tools-exec-1206.eqiad.wmflabs tools-exec-1206.tools.eqiad.wmflabs
+tools-exec-1207.eqiad.wmflabs tools-exec-1207.tools.eqiad.wmflabs
+tools-exec-1208.eqiad.wmflabs tools-exec-1208.tools.eqiad.wmflabs
+tools-exec-1209.eqiad.wmflabs tools-exec-1209.tools.eqiad.wmflabs
+tools-exec-1210.eqiad.wmflabs tools-exec-1210.tools.eqiad.wmflabs
+tools-exec-1211.eqiad.wmflabs tools-exec-1211.tools.eqiad.wmflabs
+tools-exec-1212.eqiad.wmflabs tools-exec-1212.tools.eqiad.wmflabs
+tools-exec-1213.eqiad.wmflabs tools-exec-1213.tools.eqiad.wmflabs
+tools-exec-1214.eqiad.wmflabs tools-exec-1214.tools.eqiad.wmflabs
+tools-exec-1215.eqiad.wmflabs tools-exec-1215.tools.eqiad.wmflabs
+tools-exec-1216.eqiad.wmflabs tools-exec-1216.tools.eqiad.wmflabs
+tools-exec-1217.eqiad.wmflabs tools-exec-1217.tools.eqiad.wmflabs
+tools-exec-1218.eqiad.wmflabs tools-exec-1218.tools.eqiad.wmflabs
+tools-exec-1219.eqiad.wmflabs tools-exec-1219.tools.eqiad.wmflabs
+tools-exec-12.eqiad.wmflabs tools-exec-12.tools.eqiad.wmflabs
+tools-exec-13.eqiad.wmflabs tools-exec-13.tools.eqiad.wmflabs
+tools-exec-1401.eqiad.wmflabs tools-exec-1401.tools.eqiad.wmflabs
+tools-exec-1402.eqiad.wmflabs tools-exec-1402.tools.eqiad.wmflabs
+tools-exec-1403.eqiad.wmflabs tools-exec-1403.tools.eqiad.wmflabs
+tools-exec-1404.eqiad.wmflabs tools-exec-1404.tools.eqiad.wmflabs
+tools-exec-1405.eqiad.wmflabs tools-exec-1405.tools.eqiad.wmflabs
+tools-exec-1406.eqiad.wmflabs tools-exec-1406.tools.eqiad.wmflabs
+tools-exec-1407.eqiad.wmflabs tools-exec-1407.tools.eqiad.wmflabs
+tools-exec-1408.eqiad.wmflabs tools-exec-1408.tools.eqiad.wmflabs
+tools-exec-1409.eqiad.wmflabs tools-exec-1409.tools.eqiad.wmflabs
+tools-exec-1410.eqiad.wmflabs tools-exec-1410.tools.eqiad.wmflabs
+tools-exec-14.eqiad.wmflabs tools-exec-14.tools.eqiad.wmflabs
+tools-exec-15.eqiad.wmflabs tools-exec-15.tools.eqiad.wmflabs
+tools-exec-catscan.eqiad.wmflabs tools-exec-catscan.tools.eqiad.wmflabs
+tools-exec-cyberbot.eqiad.wmflabs tools-exec-cyberbot.tools.eqiad.wmflabs
+tools-exec-gift.eqiad.wmflabs tools-exec-gift.tools.eqiad.wmflabs
+tools-exec-wmt.eqiad.wmflabs tools-exec-wmt.tools.eqiad.wmflabs
+tools-login.eqiad.wmflabs tools-login.tools.eqiad.wmflabs
+tools-mail.eqiad.wmflabs tools-mail.tools.eqiad.wmflabs
+tools-precise-dev.eqiad.wmflabs tools-precise-dev.tools.eqiad.wmflabs
+tools-services-01.eqiad.wmflabs tools-services-01.tools.eqiad.wmflabs
+tools-services-02.eqiad.wmflabs tools-services-02.tools.eqiad.wmflabs
+tools-submit.eqiad.wmflabs tools-submit.tools.eqiad.wmflabs
+tools-trusty.eqiad.wmflabs tools-trusty.tools.eqiad.wmflabs
+tools-webgrid-01.eqiad.wmflabs tools-webgrid-01.tools.eqiad.wmflabs
+tools-webgrid-02.eqiad.wmflabs tools-webgrid-02.tools.eqiad.wmflabs
+tools-webgrid-03.eqiad.wmflabs tools-webgrid-03.tools.eqiad.wmflabs
+tools-webgrid-05.eqiad.wmflabs tools-webgrid-05.tools.eqiad.wmflabs
+tools-webgrid-06.eqiad.wmflabs tools-webgrid-06.tools.eqiad.wmflabs
+tools-webgrid-07.eqiad.wmflabs tools-webgrid-07.tools.eqiad.wmflabs
+tools-webgrid-08.eqiad.wmflabs tools-webgrid-08.tools.eqiad.wmflabs
+tools-webgrid-generic-01.eqiad.wmflabs
tools-webgrid-generic-01.tools.eqiad.wmflabs
+tools-webgrid-generic-02.eqiad.wmflabs
tools-webgrid-generic-02.tools.eqiad.wmflabs
+tools-webgrid-generic-1401.eqiad.wmflabs
tools-webgrid-generic-1401.tools.eqiad.wmflabs
+tools-webgrid-generic-1401.eqiad.wmflabs
tools-webgrid-generic-1401.tools.eqiad.wmflabs
+tools-webgrid-generic-1402.eqiad.wmflabs
tools-webgrid-generic-1402.tools.eqiad.wmflabs
+tools-webgrid-generic-1402.eqiad.wmflabs
tools-webgrid-generic-1402.tools.eqiad.wmflabs
+tools-webgrid-generic-1403.eqiad.wmflabs
tools-webgrid-generic-1403.tools.eqiad.wmflabs
+tools-webgrid-generic-1403.eqiad.wmflabs
tools-webgrid-generic-1403.tools.eqiad.wmflabs
+tools-webgrid-generic-1404.eqiad.wmflabs
tools-webgrid-generic-1404.tools.eqiad.wmflabs
+tools-webgrid-generic-1404.eqiad.wmflabs
tools-webgrid-generic-1404.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1201.eqiad.wmflabs
tools-webgrid-lighttpd-1201.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1201.eqiad.wmflabs
tools-webgrid-lighttpd-1201.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1202.eqiad.wmflabs
tools-webgrid-lighttpd-1202.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1202.eqiad.wmflabs
tools-webgrid-lighttpd-1202.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1203.eqiad.wmflabs
tools-webgrid-lighttpd-1203.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1203.eqiad.wmflabs
tools-webgrid-lighttpd-1203.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1204.eqiad.wmflabs
tools-webgrid-lighttpd-1204.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1204.eqiad.wmflabs
tools-webgrid-lighttpd-1204.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1205.eqiad.wmflabs
tools-webgrid-lighttpd-1205.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1205.eqiad.wmflabs
tools-webgrid-lighttpd-1205.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1206.eqiad.wmflabs
tools-webgrid-lighttpd-1206.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1206.eqiad.wmflabs
tools-webgrid-lighttpd-1206.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1207.eqiad.wmflabs
tools-webgrid-lighttpd-1207.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1207.eqiad.wmflabs
tools-webgrid-lighttpd-1207.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1208.eqiad.wmflabs
tools-webgrid-lighttpd-1208.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1208.eqiad.wmflabs
tools-webgrid-lighttpd-1208.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1209.eqiad.wmflabs
tools-webgrid-lighttpd-1209.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1209.eqiad.wmflabs
tools-webgrid-lighttpd-1209.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1210.eqiad.wmflabs
tools-webgrid-lighttpd-1210.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1210.eqiad.wmflabs
tools-webgrid-lighttpd-1210.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1401.eqiad.wmflabs
tools-webgrid-lighttpd-1401.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1401.eqiad.wmflabs
tools-webgrid-lighttpd-1401.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1402.eqiad.wmflabs
tools-webgrid-lighttpd-1402.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1402.eqiad.wmflabs
tools-webgrid-lighttpd-1402.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1403.eqiad.wmflabs
tools-webgrid-lighttpd-1403.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1403.eqiad.wmflabs
tools-webgrid-lighttpd-1403.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1404.eqiad.wmflabs
tools-webgrid-lighttpd-1404.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1404.eqiad.wmflabs
tools-webgrid-lighttpd-1404.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1405.eqiad.wmflabs
tools-webgrid-lighttpd-1405.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1405.eqiad.wmflabs
tools-webgrid-lighttpd-1405.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1406.eqiad.wmflabs
tools-webgrid-lighttpd-1406.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1406.eqiad.wmflabs
tools-webgrid-lighttpd-1406.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1407.eqiad.wmflabs
tools-webgrid-lighttpd-1407.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1407.eqiad.wmflabs
tools-webgrid-lighttpd-1407.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1408.eqiad.wmflabs
tools-webgrid-lighttpd-1408.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1408.eqiad.wmflabs
tools-webgrid-lighttpd-1408.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1409.eqiad.wmflabs
tools-webgrid-lighttpd-1409.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1409.eqiad.wmflabs
tools-webgrid-lighttpd-1409.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1410.eqiad.wmflabs
tools-webgrid-lighttpd-1410.tools.eqiad.wmflabs
+tools-webgrid-lighttpd-1410.eqiad.wmflabs
tools-webgrid-lighttpd-1410.tools.eqiad.wmflabs
+tools-webproxy.eqiad.wmflabs tools-webproxy.tools.eqiad.wmflabs
diff --git a/modules/toollabs/manifests/master.pp
b/modules/toollabs/manifests/master.pp
index dbfe014..fa12a23 100644
--- a/modules/toollabs/manifests/master.pp
+++ b/modules/toollabs/manifests/master.pp
@@ -52,6 +52,18 @@
# any singleton instance.
#
+ # Make sure that old-style fqdn for nodes are still understood
+ # in this new-style fqnd environment by making aliases for the
+ # nodes that existed before the change:
+ file { '/var/lib/gridengine/default/common/host_aliases':
+ ensure => file,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///modules/toollabs/host_aliases',
+ require => Mount['/var/lib/gridengine'],
+ }
+
# TODO: Remove after migration.
file { "${toollabs::repo}/update-repo.sh":
ensure => absent,
--
To view, visit https://gerrit.wikimedia.org/r/215918
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbdc4954e6b26185f92995aef035edae15220eb7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
