Andrew Bogott has submitted this change and it was merged.
Change subject: Undefine virt1005 and 1006.
......................................................................
Undefine virt1005 and 1006.
They're empty and ready to be powered down for now.
Change-Id: Ie8967869b8754e843a63e50e6ff0590eba5799f5
---
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, 12 insertions(+), 16 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index b7443a5..433802b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2398,7 +2398,16 @@
}
}
-node /^virt100[1-9].eqiad.wmnet/ {
+node /^virt100[1-4].eqiad.wmnet/ {
+ $use_neutron = false
+ role nova::compute
+ include standard
+ if $use_neutron == true {
+ include role::neutron::computenode
+ }
+}
+
+node /^virt100[7-9].eqiad.wmnet/ {
$use_neutron = false
role nova::compute
include standard
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index 558c832..d5eb89c 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -95,7 +95,8 @@
argon|bast4001|copper|neon|ruthenium|subra|suhail|titanium|ytterbium|zirconium)
echo partman/raid1-lvm.cfg ;; \
cerium|praseodymium|xenon) echo partman/cassandrahosts.cfg ;; \
restbase1*) echo partman/cassandrahosts.cfg ;; \
- virt100[1-9]) echo partman/virt-raid10-cisco.cfg ;; \
+ virt100[1-4]) echo partman/virt-raid10-cisco.cfg ;; \
+ virt100[7-9]) echo partman/virt-raid10-cisco.cfg ;; \
virt101[0-2]) echo partman/virt-hp.cfg ;; \
labvirt100[1-9]) echo partman/virt-hp.cfg ;; \
labnet1001) echo partman/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 b4438dd..a1c825e 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -83,20 +83,6 @@
filename "precise-installer/ubuntu-installer/amd64/pxelinux.0";
}
-host virt1005 {
- hardware ethernet 00:22:BD:D3:38:7E;
- fixed-address virt1005.eqiad.wmnet;
- option pxelinux.pathprefix "precise-installer/";
- filename "precise-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
-host virt1006 {
- hardware ethernet 88:43:E1:C2:5B:FA;
- fixed-address virt1006.eqiad.wmnet;
- option pxelinux.pathprefix "precise-installer/";
- filename "precise-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
host virt1007 {
hardware ethernet 88:43:E1:C2:91:AE;
fixed-address virt1007.eqiad.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/209281
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8967869b8754e843a63e50e6ff0590eba5799f5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
