RobH has submitted this change and it was merged.
Change subject: folks complained it wasnt bast4001
......................................................................
folks complained it wasnt bast4001
Change-Id: Ia6faa7ddbb9696e033118f76fd3e8a1b40892f59
---
M files/autoinstall/netboot.cfg
M files/dhcpd/linux-host-entries.ttyS1-115200
M manifests/site.pp
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
RobH: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/autoinstall/netboot.cfg b/files/autoinstall/netboot.cfg
index 6f9f2c9..719a310 100755
--- a/files/autoinstall/netboot.cfg
+++ b/files/autoinstall/netboot.cfg
@@ -67,7 +67,7 @@
search[0-9]*) echo partman/search.cfg ;; \
snapshot[1-4]|snapshot100[1-4]) echo partman/snapshot.cfg ;; \
stat1002) echo partman/lvm-noraid-large.a.cfg ;; \
-
bastion4001|copper|emery|neon|harmon|ssl[1-3]0[0-9][0-9]|ssl[0-9]|ytterbium|zirconium)
echo partman/raid1-lvm.cfg ;; \
+
bast4001|copper|emery|neon|harmon|ssl[1-3]0[0-9][0-9]|ssl[0-9]|ytterbium|zirconium)
echo partman/raid1-lvm.cfg ;; \
solr[1-3]|solr100[1-3]) echo partman/lvm.cfg ;; \
virt[5-9]|virt1[0-6]) echo partman/virt-raid10-cisco.cfg ;; \
virt100[1-3]) echo partman/virt-raid10-cisco-ceph.cfg ;; \
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200
b/files/dhcpd/linux-host-entries.ttyS1-115200
index 1758d9b..4a5184e 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -219,9 +219,9 @@
fixed-address bast1001.wikimedia.org;
}
-host bastion4001 {
+host bast4001 {
hardware ethernet 90:b1:1c:4d:42:49;
- fixed-address bastion4001.wikimedia.org;
+ fixed-address bast4001.wikimedia.org;
}
host beryllium {
diff --git a/manifests/site.pp b/manifests/site.pp
index 2ef92ac..c62473e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -241,7 +241,7 @@
misc::dsh
}
-node "bastion4001.wikimedia.org" {
+node "bast4001.wikimedia.org" {
system_role { "misc": description => "Operations Bastion" }
$cluster = "misc"
$domain_search = "wikimedia.org eqiad.wmnet pmtpa.wmnet ulsfo.wmnet
esams.wikimedia.org"
--
To view, visit https://gerrit.wikimedia.org/r/85872
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6faa7ddbb9696e033118f76fd3e8a1b40892f59
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
