Ppchelko has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/278764

Change subject: RESTBase: Use backend config option to select sqlite storage.
......................................................................

RESTBase: Use backend config option to select sqlite storage.

After https://github.com/wikimedia/restbase/pull/560 we're able
to switch between cassandra and sqlite by a config option. This
patch adds this option to vagrant, so we would be able to delete
vagrant-specific configs from RESTBase codebase.

Change-Id: I8a8fecaeed99fc1b3df55dd0fe9f534e29e2a66c
---
M puppet/modules/restbase/templates/config.yaml.erb
1 file changed, 3 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/64/278764/1

diff --git a/puppet/modules/restbase/templates/config.yaml.erb 
b/puppet/modules/restbase/templates/config.yaml.erb
index d8228ec..81bbb09 100644
--- a/puppet/modules/restbase/templates/config.yaml.erb
+++ b/puppet/modules/restbase/templates/config.yaml.erb
@@ -4,19 +4,11 @@
 # in the root_spec further down.
 default_project: &default_project
   x-modules:
-    - path: projects/wmf_sqlite.yaml
+    - path: projects/wmf_default.yaml
       options: &default_options
         table:
-          hosts: [localhost]
-          keyspace: system
-          username: cassandra
-          password: cassandra
-          defaultConsistency: one # or 'localQuorum' for production
-          storage_groups:
-            - name: group.local
-              domains: /./
+          backend: sqlite
           dbname: <%= @dbdir %>/mw-vagrant.sqlite3
-          version: 1
         parsoid:
           host: http://localhost:<%= scope['::mediawiki::parsoid::port'] %>
         action:
@@ -32,7 +24,7 @@
 
 wikimedia.org: &wikimedia.org
   x-modules:
-    - path: projects/wikimedia.org_sqlite.yaml
+    - path: projects/wikimedia.org.yaml
       options:
         <<: *default_options
         pageviews:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a8fecaeed99fc1b3df55dd0fe9f534e29e2a66c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ppchelko <[email protected]>

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

Reply via email to