Dzahn has submitted this change and it was merged.
Change subject: Remove virt12-15 from puppet
......................................................................
Remove virt12-15 from puppet
13, 14, and 15 never existed. I'm removing just 12 as a test
in anticipation of decommissioning all of the pmtpa virt hosts.
RT 7280
Change-Id: Ia7e0f1a9a2f337656f25c228c59cd41b58632fb3
---
M manifests/site.pp
M modules/install-server/files/autoinstall/netboot.cfg
M modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
3 files changed, 2 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index b2b2762..1496ebc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2800,7 +2800,7 @@
include role::nova::api
}
-node /virt([5-9]|1[0-5]).pmtpa.wmnet/ {
+node /virt([5-9]|1[0-1]).pmtpa.wmnet/ {
$cluster = 'virt'
if $::hostname =~ /^virt5$/ {
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index ef3c051..2887400 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -78,7 +78,7 @@
stat1002) echo partman/lvm-noraid-large.a.cfg ;; \
bast4001|cerium|copper|emery|neon|praseodymium|ruthenium|ssl[1-3]0[0-9][0-9]|ssl[0-9]|titanium|ytterbium|xenon|zirconium)
echo partman/raid1-lvm.cfg ;; \
solr100[1-3]) echo partman/lvm.cfg ;; \
- virt[5-9]|virt1[0-6]) echo partman/virt-raid10-cisco.cfg ;; \
+ virt[5-9]|virt1[0-1]) echo partman/virt-raid10-cisco.cfg ;; \
virt100[1-9]) echo partman/virt-raid10-cisco.cfg ;; \
labnet1001) echo partman/lvm.cfg ;; \
wtp100[5-9]|wtp10[1-2][0-9]|hafnium) echo partman/raid1-lvm.cfg
;; \
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
index bfb2bbf..639368c 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -150,11 +150,6 @@
fixed-address virt11.pmtpa.wmnet;
}
-host virt12 {
- hardware ethernet 88:43:E1:C2:9C:74;
- fixed-address virt12.pmtpa.wmnet;
-}
-
host virt15 {
hardware ethernet 88:43:E1:C2:7B:6C;
fixed-address virt15.pmtpa.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/125979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7e0f1a9a2f337656f25c228c59cd41b58632fb3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
