Andrew Bogott has submitted this change and it was merged.
Change subject: Use 10g interface for labnet1001
......................................................................
Use 10g interface for labnet1001
Change-Id: I4662d24173f687f6c891bd79dfcb4770643fb7d5
---
M manifests/role/nova.pp
1 file changed, 9 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 89d1ccc..1305be2 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -208,7 +208,15 @@
keystone_auth_protocol => $keystoneconfig["auth_protocol"],
keystone_auth_port => $keystoneconfig["auth_port"],
}
- $novaconfig = merge( $eqiadnovaconfig, $commonnovaconfig )
+ if ( $::hostname == "labnet1001" ) {
+ $networkconfig = {
+ network_flat_interface => "eth4.1118",
+ network_flat_interface_name => "eth4",
+ }
+ $novaconfig = merge( $eqiadnovaconfig, $commonnovaconfig,
$networkconfig )
+ } else {
+ $novaconfig = merge( $eqiadnovaconfig, $commonnovaconfig )
+ }
}
class role::nova::common {
--
To view, visit https://gerrit.wikimedia.org/r/112191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4662d24173f687f6c891bd79dfcb4770643fb7d5
Gerrit-PatchSet: 1
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
