Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347892 )
Change subject: planet/varnish-misc: switch planet to active-active
......................................................................
planet/varnish-misc: switch planet to active-active
The planet service can be active/active.
There is an existing planet2001 in codfw already setup and running
just that it was active/passive so far.
So for the datacenter switch, and in general,
add the second backend in codfw in misc varnish
config.
And in planet itself remove the "active_dc" setting which made one
of them passive and run the update cron jobs in both.
Bug:T88761
Bug:T156937
Change-Id: Ifbfe4b3ddfb5de259be64a9ea02067c66f24f122
---
M hieradata/role/common/cache/misc.yaml
M modules/planet/manifests/cronjob.pp
M modules/planet/manifests/init.pp
M modules/profile/manifests/planet/venus.pp
4 files changed, 2 insertions(+), 15 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/role/common/cache/misc.yaml
b/hieradata/role/common/cache/misc.yaml
index 8f66ab3..04b49c3 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -87,6 +87,7 @@
planet1001:
backends:
eqiad: 'planet1001.eqiad.wmnet'
+ codfw: 'planet2001.codfw.wmnet'
pybal_config:
backends:
eqiad: 'puppetmaster1001.eqiad.wmnet'
diff --git a/modules/planet/manifests/cronjob.pp
b/modules/planet/manifests/cronjob.pp
index 0f00b9f..c1a125c 100644
--- a/modules/planet/manifests/cronjob.pp
+++ b/modules/planet/manifests/cronjob.pp
@@ -8,15 +8,8 @@
# randomize the minute crons run, using $title as seed
$minute = fqdn_rand(60, $title)
- # crons only running if in active datacenter
- if $planet::planet_active_dc in $::domain {
- $cron_ensure = 'present'
- } else {
- $cron_ensure = 'absent'
- }
-
cron { "update-${title}-planet":
- ensure => $cron_ensure,
+ ensure => 'present',
command => "http_proxy=\"${planet::planet_http_proxy}\"
https_proxy=\$http_proxy ${planet_bin} -v ${planet_config} > ${planet_logfile}
2>&1",
user => 'planet',
minute => $minute,
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index 6fb534d..e3ee27f 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -15,14 +15,11 @@
# example: meta.wikimedia.org/wiki/Planet_Wikimedia
# $planet_http_proxy - set proxy to be used for downloading feeds
# example: http://url-downloader.${::site}.wikimedia.org:8080
-# $planet_active_dc - currently active datacenter, updates will only run here
-# example: eqiad
class planet (
$planet_domain_name,
$planet_languages,
$planet_meta_link,
$planet_http_proxy,
- $planet_active_dc,
) {
# locales are essential for planet
diff --git a/modules/profile/manifests/planet/venus.pp
b/modules/profile/manifests/planet/venus.pp
index b9d061c..5a44112 100644
--- a/modules/profile/manifests/planet/venus.pp
+++ b/modules/profile/manifests/planet/venus.pp
@@ -6,8 +6,6 @@
#
# $planet_http_proxy: since we are on a private IP now we need to proxy to
fetch external URLs
#
-# $planet_active_dc: set to the currently active DC. feed updates are only
running here.
-#
# $planet_languages: translated strings for the UI in various languages
# list all planet languages and translations for
index.html.tmpl here.
# configurations, directories and cronjobs are auto-created
from this hash.
@@ -16,7 +14,6 @@
$planet_domain_name = hiera('planet_domain_name'),
$planet_meta_link = 'meta.wikimedia.org/wiki/Planet_Wikimedia',
$planet_http_proxy = "http://url-downloader.${::site}.wikimedia.org:8080";,
- $planet_active_dc = 'eqiad',
$planet_languages = {
ar => {
'subscribe' => 'اشترك',
@@ -210,7 +207,6 @@
planet_languages => $planet_languages,
planet_meta_link => $planet_meta_link,
planet_http_proxy => $planet_http_proxy,
- planet_active_dc => $planet_active_dc
}
# firewalling
--
To view, visit https://gerrit.wikimedia.org/r/347892
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifbfe4b3ddfb5de259be64a9ea02067c66f24f122
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
