20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/345491 )

Change subject: Turn on read: true to both clusters for now
......................................................................

Turn on read: true to both clusters for now

A bogus test is preventing the previous config from working, I'll
fix the phab code but for now lets patch over it with a config
change.

fixes T161772

Change-Id: I592954b0a19443d76f7bdd952691fd71cc06ff86
---
M hieradata/role/codfw/phabricator/main.yaml
M hieradata/role/common/phabricator/main.yaml
M hieradata/role/eqiad/phabricator/main.yaml
3 files changed, 19 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/345491/1

diff --git a/hieradata/role/codfw/phabricator/main.yaml 
b/hieradata/role/codfw/phabricator/main.yaml
index dd74381..99c1d83 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 496297c..e8195f8 100644
--- a/hieradata/role/common/phabricator/main.yaml
+++ b/hieradata/role/common/phabricator/main.yaml
@@ -21,22 +21,22 @@
 
 phabricator_cluster_search:
   - type: 'elasticsearch'
-    path: '/phabricator'
+    version: 5
+    protocol: 'https'
     port: 9243
+    path: '/phabricator'
     hosts:
-      - protocol: 'https'
-        host: 'search.svc.eqiad.wmnet'
-        version: 5
+      - host: 'search.svc.eqiad.wmnet'
         roles:
           read: true
           write: true
   - type: 'elasticsearch'
-    path: '/phabricator'
+    version: 5
+    protocol: 'https'
     port: 9243
+    path: '/phabricator'
     hosts:
-      - protocol: 'https'
-        host: 'search.svc.codfw.wmnet'
-        version: 5
+      - host: 'search.svc.codfw.wmnet'
         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 d550232..76d6ad4 100644
--- a/hieradata/role/eqiad/phabricator/main.yaml
+++ b/hieradata/role/eqiad/phabricator/main.yaml
@@ -41,5 +41,5 @@
         host: 'search.svc.codfw.wmnet'
         version: 5
         roles:
-          read: false
+          read: true
           write: true
\ No newline at end of file

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

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

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

Reply via email to