Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/345488 )
Change subject: Phabricator: Fix up elasticsearch cluster config
......................................................................
Phabricator: Fix up elasticsearch cluster config
Since eqiad and codfw are separate elasticsearch clusters
that don't replicate, we need to define them that way in
phabricator's config so that it doesn't treat the two as
a single cluster for the purpose of load-balancing.
Change-Id: I9cb0bdfe72ff90e3b8238b89c87d9028f0e4e658
---
M hieradata/role/codfw/phabricator/main.yaml
M hieradata/role/common/phabricator/main.yaml
M hieradata/role/eqiad/phabricator/main.yaml
3 files changed, 26 insertions(+), 26 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/role/codfw/phabricator/main.yaml
b/hieradata/role/codfw/phabricator/main.yaml
index 99c1d83..dd74381 100644
--- a/hieradata/role/codfw/phabricator/main.yaml
+++ b/hieradata/role/codfw/phabricator/main.yaml
@@ -21,18 +21,18 @@
port: 9243
hosts:
- protocol: 'https'
+ host: 'search.svc.eqiad.wmnet'
+ version: 5
+ roles:
+ read: false
+ write: true
+ - type: 'elasticsearch'
+ path: '/phabricator'
+ port: 9243
+ hosts:
+ - protocol: 'https'
host: 'search.svc.codfw.wmnet'
version: 5
roles:
read: true
write: true
- - protocol: 'https'
- host: 'search.svc.eqiad.wmnet'
- version: 5
- roles:
- read: true
- write: true
- - type: 'mysql'
- roles:
- read: false
- write: false
diff --git a/hieradata/role/common/phabricator/main.yaml
b/hieradata/role/common/phabricator/main.yaml
index ce8382d..496297c 100644
--- a/hieradata/role/common/phabricator/main.yaml
+++ b/hieradata/role/common/phabricator/main.yaml
@@ -25,18 +25,18 @@
port: 9243
hosts:
- protocol: 'https'
- host: 'search.svc.codfw.wmnet'
- version: 5
- roles:
- read: true
- write: true
- - protocol: 'https'
host: 'search.svc.eqiad.wmnet'
version: 5
roles:
read: true
write: true
- - type: 'mysql'
- roles:
- read: false
- write: false
+ - type: 'elasticsearch'
+ path: '/phabricator'
+ port: 9243
+ hosts:
+ - protocol: 'https'
+ host: 'search.svc.codfw.wmnet'
+ version: 5
+ roles:
+ read: true
+ write: true
\ No newline at end of file
diff --git a/hieradata/role/eqiad/phabricator/main.yaml
b/hieradata/role/eqiad/phabricator/main.yaml
index 95d4ae6..d550232 100644
--- a/hieradata/role/eqiad/phabricator/main.yaml
+++ b/hieradata/role/eqiad/phabricator/main.yaml
@@ -33,13 +33,13 @@
roles:
read: true
write: true
+ - type: 'elasticsearch'
+ path: '/phabricator'
+ port: 9243
+ hosts:
- protocol: 'https'
host: 'search.svc.codfw.wmnet'
version: 5
roles:
- read: true
- write: true
- - type: 'mysql'
- roles:
- read: false
- write: false
\ No newline at end of file
+ read: false
+ write: true
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/345488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9cb0bdfe72ff90e3b8238b89c87d9028f0e4e658
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 <[email protected]>
Gerrit-Reviewer: 20after4 <[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
