Ryan Lane has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/62862


Change subject: Only bond interface in pmtpa for nova-network
......................................................................

Only bond interface in pmtpa for nova-network

Change-Id: I9a9f8803967a363303ba791ba97c4545361e8351
---
M manifests/role/nova.pp
1 file changed, 10 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/62862/1

diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index a11c271..44aa437 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -291,16 +291,18 @@
 
        include role::nova::common
 
-       require role::nova::network::bonding
+       if ($::site == "pmtpa") {
+               require role::nova::network::bonding
 
-       interface_ip { "openstack::network_service_public_dynamic_snat": 
interface => "lo", address => $site ? { "pmtpa" => "208.80.153.192", "eqiad" => 
"208.80.155.255" } }
+               interface_ip { 
"openstack::network_service_public_dynamic_snat": interface => "lo", address => 
$site ? { "pmtpa" => "208.80.153.192", "eqiad" => "208.80.155.255" } }
 
-       interface_tagged { "bond1.103":
-               base_interface => "bond1",
-               vlan_id => "103",
-               method => "manual",
-               up => 'ip link set $IFACE up',
-               down => 'ip link set $IFACE down',
+               interface_tagged { "bond1.103":
+                       base_interface => "bond1",
+                       vlan_id => "103",
+                       method => "manual",
+                       up => 'ip link set $IFACE up',
+                       down => 'ip link set $IFACE down',
+               }
        }
 
        class { "openstack::network-service": openstack_version => 
$openstack_version, novaconfig => $novaconfig }

-- 
To view, visit https://gerrit.wikimedia.org/r/62862
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a9f8803967a363303ba791ba97c4545361e8351
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to