RobH has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/376576 )
Change subject: set deploy1001 isntall params ...................................................................... set deploy1001 isntall params deploy1001 install info, setting to spare until pressed into service Bug: T175288 Change-Id: I157ba11946749f8d7260c1ca2e7bbf59c965966d --- M manifests/site.pp M modules/install_server/files/autoinstall/netboot.cfg M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 3 files changed, 14 insertions(+), 5 deletions(-) Approvals: jenkins-bot: Verified RobH: Looks good to me, approved diff --git a/manifests/site.pp b/manifests/site.pp index 0466759..4e61632 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -801,6 +801,11 @@ role(tendril) } +# will become a deployment server and fold into deployment stanza with tin/naos T175288 +node 'deploy1001.eqiad.wmnet' { + role(spare::system) + interface::add_ip6_mapped { 'main': } +} # Analytics Druid servers. # https://wikitech.wikimedia.org/wiki/Analytics/Data_Lake#Druid diff --git a/modules/install_server/files/autoinstall/netboot.cfg b/modules/install_server/files/autoinstall/netboot.cfg index 80339d6..b3a5cb8 100755 --- a/modules/install_server/files/autoinstall/netboot.cfg +++ b/modules/install_server/files/autoinstall/netboot.cfg @@ -67,6 +67,7 @@ db109[6-9]|db110[0-6]|db1069) echo partman/db.cfg ;; \ db207[1-9]|db208[0-9]|db209[0-2]|dbstore2001) echo partman/db.cfg ;; \ db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9]) echo partman/db-no-srv-format.cfg ;; \ + deploy[12]001) echo partman/raid1-lvm-ext4-srv-noswap.cfg;; \ d-i-test) echo partman/flat.cfg virtual.cfg ;; \ druid100[1-6]) echo partman/druid-4ssd-raid10.cfg ;; \ dumpsdata100[12]|labstore100[67]) echo partman/dumpsdata100X.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 91dd991..4c673bd 100644 --- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -517,6 +517,11 @@ fixed-address cp1074.eqiad.wmnet; } +host cp1099 { + hardware ethernet 90:B1:1C:3B:C7:2C; + fixed-address cp1099.eqiad.wmnet; +} + host cp2001 { hardware ethernet 44:A8:42:2D:20:1D; fixed-address cp2001.codfw.wmnet; @@ -646,8 +651,6 @@ hardware ethernet 44:A8:42:2D:1C:87; fixed-address cp2026.codfw.wmnet; } - - host cp3003 { hardware ethernet D4:AE:52:8C:8B:7E; @@ -1797,9 +1800,9 @@ filename "stretch-installer/debian-installer/amd64/pxelinux.0"; } -host cp1099 { - hardware ethernet 90:B1:1C:3B:C7:2C; - fixed-address cp1099.eqiad.wmnet; +host deploy1001 { + hardware ethernet 14:18:77:5B:2B:1D; + fixed-address deploy1001.eqiad.wmnet; } host druid1001 { -- To view, visit https://gerrit.wikimedia.org/r/376576 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I157ba11946749f8d7260c1ca2e7bbf59c965966d Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RobH <r...@wikimedia.org> Gerrit-Reviewer: RobH <r...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits