Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/401550 )
Change subject: cache: add ipsec to basic roles
..
cache: add ipsec to basic roles
Change-Id: I96430566dd486630d393457ef33460b0581078ed
---
M manifests/site.pp
M modules/role/manifests/cache/misc.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
4 files changed, 22 insertions(+), 11 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
Ema: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index e0edbe8..3843ecd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -191,7 +191,7 @@
node /^cp10(45|5[18]|61)\.eqiad\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role(cache::misc, ipsec)
+role(cache::misc)
}
node 'cp1046.eqiad.wmnet', 'cp1047.eqiad.wmnet', 'cp1059.eqiad.wmnet',
'cp1060.eqiad.wmnet' {
@@ -201,22 +201,22 @@
node /^cp10(4[89]|50|6[234]|7[1-4]|99)\.eqiad\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role(cache::upload, ipsec)
+role(cache::upload)
}
node /^cp10(5[2-5]|6[5-8])\.eqiad\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role(cache::text, ipsec)
+role(cache::text)
}
node /^cp20(0[147]|1[0369]|23)\.codfw\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role(cache::text, ipsec)
+role(cache::text)
}
node /^cp20(0[258]|1[147]|2[0246])\.codfw\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role(cache::upload, ipsec)
+role(cache::upload)
}
node /^cp20(0[39]|15|21)\.codfw\.wmnet$/ {
@@ -226,7 +226,7 @@
node /^cp20(06|1[28]|25)\.codfw\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role(cache::misc, ipsec)
+role(cache::misc)
}
node /^cp300[3-6]\.esams\.wmnet$/ {
@@ -236,7 +236,7 @@
node /^cp30(0[789]|10)\.esams\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role(cache::misc, ipsec)
+role(cache::misc)
}
node 'cp3022.esams.wmnet' {
@@ -245,12 +245,12 @@
node /^cp30[34][0123]\.esams\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role(cache::text, ipsec)
+role(cache::text)
}
node /^cp30[34][4-9]\.esams\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role(cache::upload, ipsec)
+role(cache::upload)
}
#
@@ -264,12 +264,12 @@
node /^cp402[1-6]\.ulsfo\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role(cache::upload, ipsec)
+role(cache::upload)
}
node /^cp40(2[789]|3[012])\.ulsfo\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
-role(cache::text, ipsec)
+role(cache::text)
}
node 'darmstadtium.eqiad.wmnet' {
diff --git a/modules/role/manifests/cache/misc.pp
b/modules/role/manifests/cache/misc.pp
index fa8944a..8f4e20b 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -6,4 +6,5 @@
include ::profile::cache::base
include ::profile::cache::ssl::unified
include ::profile::cache::misc
+include ::role::ipsec
}
diff --git a/modules/role/manifests/cache/text.pp
b/modules/role/manifests/cache/text.pp
index 1cb4d10..8d362c7 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -13,4 +13,9 @@
# and sends them to the 'statsv' topic in Kafka. A kafka consumer
# (called 'statsv') then consumes these and emits metrics.
include ::profile::cache::kafka::statsv
+
+# TODO: refactor all this so that we have separate roles for production
and labs
+if $::realm == 'production' {
+include ::role::ipsec
+}
}
diff --git a/modules/role/manifests/cache/upload.pp
b/modules/role/manifests/cache/upload.pp
index 2e85df3..25602f3 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -9,4 +9,9 @@
include ::profile::cache::base
include ::profile::cache::ssl::unified
include ::profile::cache::upload
+
+# TODO: refactor all this so that we have separate roles for production
and labs
+if $::realm == 'production' {
+include ::role::ipsec
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/401550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I96430566dd486630d393457ef33460b0581078ed
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: Ema
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
