Faidon Liambotis has submitted this change and it was merged. Change subject: mirror1001 -> sodium ......................................................................
mirror1001 -> sodium Change-Id: I8ae0c6ba1c3662f2fe18a9ea9316220c7fefb7f1 --- 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, 10 insertions(+), 3 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index 58b61b4..bd8a767 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2676,6 +2676,13 @@ include standard } +node 'sodium.wikimedia.org' { + include base::firewall + include standard + + interface::add_ip6_mapped { 'main': } +} + node /^(strontium|rhodium).eqiad.wmnet/ { role puppetmaster::backend include standard diff --git a/modules/install_server/files/autoinstall/netboot.cfg b/modules/install_server/files/autoinstall/netboot.cfg index 130fd7c..c3a9ece 100755 --- a/modules/install_server/files/autoinstall/netboot.cfg +++ b/modules/install_server/files/autoinstall/netboot.cfg @@ -91,7 +91,7 @@ labsdb100[45]) echo partman/osmlabsdb.cfg ;; \ labsdb100[67]) echo partman/raid5-gpt-lvm.cfg ;; \ labsdb[1-3]|labsdb100[1-3]) echo partman/mw.cfg ;; \ - mirror1001|labstore200[3-4]) echo partman/lvm-ext-srv.cfg ;; \ + sodium|labstore200[3-4]) echo partman/lvm-ext-srv.cfg ;; \ labtestneutron2001) echo partman/mw.cfg ;; \ labtestnet2001) echo partman/raid1.cfg ;; \ labtestweb2001) 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 a54d90c..0a13149 100644 --- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -3445,9 +3445,9 @@ filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0"; } -host mirror1001 { +host sodium { hardware ethernet f4:e9:d4:94:c5:90; - fixed-address mirror1001.wikimedia.org; + fixed-address sodium.wikimedia.org; } host ms1001 { -- To view, visit https://gerrit.wikimedia.org/r/300555 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ae0c6ba1c3662f2fe18a9ea9316220c7fefb7f1 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org> Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits