Filippo Giunchedi has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/360865 )
Change subject: hieradata: add codfw thumbor config ...................................................................... hieradata: add codfw thumbor config Change-Id: I7edcb6aa6cd54ac96d63e913a1c7624865938f2f --- M hieradata/codfw/swift/proxy.yaml M hieradata/eqiad.yaml A hieradata/role/codfw/thumbor/mediawiki.yaml M hieradata/role/eqiad/thumbor/mediawiki.yaml 4 files changed, 22 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/65/360865/1 diff --git a/hieradata/codfw/swift/proxy.yaml b/hieradata/codfw/swift/proxy.yaml index 8dc26fd..dd345d8 100644 --- a/hieradata/codfw/swift/proxy.yaml +++ b/hieradata/codfw/swift/proxy.yaml @@ -7,4 +7,4 @@ # no trailing comma! ] -swift::proxy::thumborhost: 'thumbor.svc.eqiad.wmnet:8800' +swift::proxy::thumborhost: 'thumbor.svc.codfw.wmnet:8800' diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml index 61da1b2..bada048 100644 --- a/hieradata/eqiad.yaml +++ b/hieradata/eqiad.yaml @@ -171,13 +171,3 @@ # Which of our redundant unified cert vendors to use in each DC public_tls_unified_cert_vendor: "globalsign" - -# -# Thumbor -# -thumbor_memcached_servers: - - thumbor1001.eqiad.wmnet - - thumbor1002.eqiad.wmnet -thumbor_memcached_servers_nutcracker: - - '10.64.16.56:11211:1 "shard01"' # thumbor1001 - - '10.64.16.57:11211:1 "shard02"' # thumbor1002 \ No newline at end of file diff --git a/hieradata/role/codfw/thumbor/mediawiki.yaml b/hieradata/role/codfw/thumbor/mediawiki.yaml new file mode 100644 index 0000000..de3a292 --- /dev/null +++ b/hieradata/role/codfw/thumbor/mediawiki.yaml @@ -0,0 +1,14 @@ +lvs::realserver::realserver_ips: + - '10.2.1.24' # thumbor.svc.codfw.wmnet + +thumbor_memcached_servers: + - thumbor2001.codfw.wmnet + - thumbor2002.codfw.wmnet + - thumbor2003.codfw.wmnet + - thumbor2004.codfw.wmnet + +thumbor_memcached_servers_nutcracker: + - '10.192.32.36:11211:1 "shard01"' # thumbor2001 + - '10.192.32.37:11211:1 "shard02"' # thumbor2002 + - '10.192.16.58:11211:1 "shard01"' # thumbor2003 + - '10.192.16.59:11211:1 "shard02"' # thumbor2004 diff --git a/hieradata/role/eqiad/thumbor/mediawiki.yaml b/hieradata/role/eqiad/thumbor/mediawiki.yaml index 39cf097..f34f2c1 100644 --- a/hieradata/role/eqiad/thumbor/mediawiki.yaml +++ b/hieradata/role/eqiad/thumbor/mediawiki.yaml @@ -1,2 +1,9 @@ lvs::realserver::realserver_ips: - '10.2.2.24' # thumbor.svc.eqiad.wmnet + +thumbor_memcached_servers: + - thumbor1001.eqiad.wmnet + - thumbor1002.eqiad.wmnet +thumbor_memcached_servers_nutcracker: + - '10.64.16.56:11211:1 "shard01"' # thumbor1001 + - '10.64.16.57:11211:1 "shard02"' # thumbor1002 -- To view, visit https://gerrit.wikimedia.org/r/360865 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7edcb6aa6cd54ac96d63e913a1c7624865938f2f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
