Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112186
Change subject: Replace some nova-network configs for eqiad.
......................................................................
Replace some nova-network configs for eqiad.
There was no need to chop this in the first place, it's
activated by switchable code elsewhere anyway.
This is a partial revert of abd0ded4213e94a822d448c3c53f75e1ba5f02a2
Change-Id: If3b72498aa98a080feb9bd167234871a06ea6f62
---
M manifests/role/nova.pp
1 file changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/112186/1
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 1215686..d13a2ef 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -148,6 +148,17 @@
glance_host => $controller_hostname,
rabbit_host => $controller_hostname,
cc_host => $controller_hostname,
+ network_flat_interface => $realm ? {
+ "production" => "eth1.1118",
+ "labs" => "eth0.1118",
+ },
+ network_flat_interface_name => $realm ? {
+ "production" => "eth1",
+ "labs" => "eth0",
+ },
+ network_flat_interface_vlan => "1118",
+ flat_network_bridge => "br1118",
+ network_public_interface => "eth0",
network_host => $realm ? {
"production" => "10.64.20.13",
"labs" => "127.0.0.1",
--
To view, visit https://gerrit.wikimedia.org/r/112186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3b72498aa98a080feb9bd167234871a06ea6f62
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
