Ryan Lane has submitted this change and it was merged.
Change subject: Split virt2 away from other virt nodes
......................................................................
Split virt2 away from other virt nodes
Change-Id: I2792c881d9831a9259798e45cd1cbc4f0a3b0eef
---
M manifests/site.pp
1 file changed, 16 insertions(+), 10 deletions(-)
Approvals:
Ryan Lane: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 4552c36..839a0c6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2504,23 +2504,29 @@
backup::client
}
-node /virt([2]|[5-9]|1[0-1]).pmtpa.wmnet/ {
+node /virt2.pmtpa.wmnet/ {
+ $cluster = "virt"
+ $openstack_version = "essex"
+
+ include standard,
+ role::nova::network,
+ role::nova::api
+
+ interface_ip { "openstack::network_service_public_dynamic_snat":
interface => "lo", address => "208.80.153.192" }
+ interface_aggregate { "bond1": orig_interface => "eth1", members => [
"eth1", "eth2", "eth3" ] }
+}
+
+node /virt([5-9]|1[0-1]).pmtpa.wmnet/ {
$cluster = "virt"
if $hostname =~ /^virt[56]$/ {
$ganglia_aggregator = "true"
}
- include standard
-
$openstack_version = "essex"
- if $hostname =~ /^virt2$/ {
- include role::nova::network,
- role::nova::api
- interface_ip {
"openstack::network_service_public_dynamic_snat": interface => "lo", address =>
"208.80.153.192" }
- interface_aggregate { "bond1": orig_interface => "eth1", members => [
"eth1", "eth2", "eth3" ] }
- }
- include role::nova::compute
+
+ include standard,
+ role::nova::compute
}
node /virt100(5|7|8).eqiad.wmnet/ {
--
To view, visit https://gerrit.wikimedia.org/r/52148
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2792c881d9831a9259798e45cd1cbc4f0a3b0eef
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
