Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/242125
Change subject: videoscaler: reimage and rename tmh1002 as mw1260, upgrade to HAT ...................................................................... videoscaler: reimage and rename tmh1002 as mw1260, upgrade to HAT Bug: T104747 Change-Id: I7380629a165190509b86fbf6cf59936971503a41 --- M manifests/site.pp M modules/dsh/files/group/mediawiki-installation M modules/install_server/files/autoinstall/netboot.cfg M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 4 files changed, 9 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/25/242125/1 diff --git a/manifests/site.pp b/manifests/site.pp index 6e4e8d5..f027cd6 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1994,8 +1994,8 @@ include base::firewall } -#mw1259 is a videoscaler -node 'mw1259.eqiad.wmnet' { +#mw1259-60 are videoscalers +node /^mw12(59|60)\.eqiad\.wmnet/ { role mediawiki::videoscaler include base::firewall } @@ -2511,11 +2511,6 @@ include base::firewall include standard include role::archiva -} - -# tmh1001/tmh1002 video encoding server (precise only) -node /^tmh100[1-2]\.eqiad\.wmnet/ { - role mediawiki::videoscaler } node 'uranium.wikimedia.org' { diff --git a/modules/dsh/files/group/mediawiki-installation b/modules/dsh/files/group/mediawiki-installation index 03aed12..e5d1c9b 100644 --- a/modules/dsh/files/group/mediawiki-installation +++ b/modules/dsh/files/group/mediawiki-installation @@ -9,7 +9,6 @@ snapshot1002.eqiad.wmnet snapshot1003.eqiad.wmnet snapshot1004.eqiad.wmnet -tmh1002.eqiad.wmnet mw1001.eqiad.wmnet mw1002.eqiad.wmnet mw1003.eqiad.wmnet @@ -268,6 +267,7 @@ mw1257.eqiad.wmnet mw1258.eqiad.wmnet mw1259.eqiad.wmnet +mw1260.eqiad.wmnet # codfw mw2001.codfw.wmnet diff --git a/modules/install_server/files/autoinstall/netboot.cfg b/modules/install_server/files/autoinstall/netboot.cfg index 4ace0cb..580cfe5 100755 --- a/modules/install_server/files/autoinstall/netboot.cfg +++ b/modules/install_server/files/autoinstall/netboot.cfg @@ -99,7 +99,7 @@ ms-be30[0-9][0-9]) echo partman/ms-be-esams.cfg ;; \ ms-fe[1-2]0[0-9][0-9]) echo partman/raid1-1partition.cfg ;; \ ms-fe30[0-9][0-9]) echo partman/flat.cfg ;; \ - mw1259) echo partman/raid1-1partition.cfg ;; \ + mw1259|mw1260) echo partman/raid1-1partition.cfg ;; \ mw[0-9]*|osmium|rcs[0-9]*) echo partman/mw.cfg ;; \ mx1001|mx2001) echo partman/flat.cfg virtual.cfg ;; \ labservices1001|nembus|neptunium|nickel|plutonium|pollux|protactinium|radium|silver|uranium) echo partman/raid1.cfg ;; \ diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 index 733220e..1756a02 100644 --- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -4699,6 +4699,11 @@ fixed-address mw1259.eqiad.wmnet; } +host mw1260 { + hardware ethernet 18:03:73:f1:59:5a; + fixed-address mw1260.eqiad.wmnet; +} + host mw2001 { hardware ethernet 78:2b:cb:2f:cf:57; fixed-address mw2001.codfw.wmnet; @@ -6212,11 +6217,6 @@ host titanium { hardware ethernet 78:2b:cb:08:aa:57; fixed-address titanium.wikimedia.org; -} - -host tmh1002 { - hardware ethernet 18:03:73:f1:59:5a; - fixed-address tmh1002.eqiad.wmnet; } host tungsten { -- To view, visit https://gerrit.wikimedia.org/r/242125 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7380629a165190509b86fbf6cf59936971503a41 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits