BBlack has uploaded a new change for review.

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

Change subject: Add iridium-vcs.eqiad.wmnet ipv6 to phab puppetization
......................................................................

Add iridium-vcs.eqiad.wmnet ipv6 to phab puppetization

Bug: T100519
Change-Id: Ie243122420d49090e454e411da974584838f3e6e
---
M hieradata/role/eqiad/phabricator/main.yaml
M manifests/role/phabricator.pp
2 files changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/265493/1

diff --git a/hieradata/role/eqiad/phabricator/main.yaml 
b/hieradata/role/eqiad/phabricator/main.yaml
index 5216b14..c604c2d 100644
--- a/hieradata/role/eqiad/phabricator/main.yaml
+++ b/hieradata/role/eqiad/phabricator/main.yaml
@@ -8,3 +8,4 @@
   - "208.80.154.250"
   - "10.64.32.186"
   - "[2620:0:861:ed1a::3:16]"
+  - "[2620:0:861:103:10:64:32:186]"
diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index 7181b5e..1ae9c1f 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -88,6 +88,13 @@
         address   => '10.64.32.186',
         prefixlen => '21',
     }
+    interface::ip { 'role::phabricator::main::ipv6':
+        interface => 'eth0',
+        address   => '2620:0:861:103:10:64:32:186',
+        prefixlen => '128',
+        # mark as deprecated = never pick this address unless explicitly asked
+        options   => 'preferred_lft 0',
+    }
 
     class { '::phabricator::tools':
         dbhost          => $mysql_host,
@@ -166,7 +173,7 @@
     }
 
     ferm::rule { 'ssh_public':
-        rule => 'saddr (0.0.0.0/0) daddr (10.64.32.186/32 208.80.154.250/32) 
proto tcp dport (22) ACCEPT;',
+        rule => 'saddr (0.0.0.0/0) daddr (10.64.32.186/32 208.80.154.250/32 
2620:0:861:103:10:64:32:186/128 2620:0:861:ed1a::3:16/128) proto tcp dport (22) 
ACCEPT;',
     }
 
     # redirect bugzilla URL patterns to phabricator

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

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

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

Reply via email to