BBlack has submitted this change and it was merged.

Change subject: add public addrs to lvs300x over 802.1q
......................................................................


add public addrs to lvs300x over 802.1q

Change-Id: If3a65f918ed2bf42a9a2cb1e84a7b06af9574295
---
M manifests/site.pp
M modules/lvs/manifests/configuration.pp
2 files changed, 17 insertions(+), 1 deletion(-)

Approvals:
  BBlack: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index 38cdea6..f9fa5af 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1522,6 +1522,16 @@
         interface => 'eth0',
     }
 
+    include lvs::configuration
+    $ips = $lvs::configuration::subnet_ips
+
+    interface::tagged { 'eth0.100':
+        base_interface => 'eth0',
+        vlan_id        => '100',
+        address        => $ips['public1-esams'][$::hostname],
+        netmask        => '255.255.255.128',
+    }
+
     # Make sure GRO is off
     interface::offload { 'eth0 gro':
         interface => 'eth0',
diff --git a/modules/lvs/manifests/configuration.pp 
b/modules/lvs/manifests/configuration.pp
index ad72151..77aae9e 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -391,7 +391,13 @@
             'lvs1004' => '10.64.49.4',
             'lvs1005' => '10.64.49.5',
             'lvs1006' => '10.64.49.6',
-        }
+        },
+        'public1-esams' => {
+            'lvs3001' => '91.198.174.11',
+            'lvs3002' => '91.198.174.12',
+            'lvs3003' => '91.198.174.13',
+            'lvs3004' => '91.198.174.14',
+        },
     }
 
     $service_ips = $lvs_service_ips[$::realm]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If3a65f918ed2bf42a9a2cb1e84a7b06af9574295
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to