Andrew Bogott has submitted this change and it was merged.
Change subject: Remove virt2 from puppet.
......................................................................
Remove virt2 from puppet.
Change-Id: I6515e1d4564ef4d3847e36d302978ecb7be6756d
---
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 0 insertions(+), 17 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index d367fc8..ea1a18f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2779,18 +2779,6 @@
include backup::client
}
-node 'virt2.pmtpa.wmnet' {
- $cluster = 'virt'
- $openstack_version = 'folsom'
- $use_neutron = false
-
- include admins::labs
-
- include standard
- include role::nova::network
- include role::nova::api
-}
-
node 'labnet1001.eqiad.wmnet' {
$cluster = 'virt'
$openstack_version = 'havana'
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 8720fd2..9327351 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3320,11 +3320,6 @@
fixed-address virt0.wikimedia.org;
}
-host virt2 {
- hardware ethernet f0:4d:a2:0b:3e:2d;
- fixed-address virt2.pmtpa.wmnet;
-}
-
host labsudb1 {
hardware ethernet f0:4d:a2:0b:33:f2;
fixed-address labsudb1.pmtpa.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/126241
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6515e1d4564ef4d3847e36d302978ecb7be6756d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
