Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402035 )
Change subject: Config: Remove references for Cassandra 2 ...................................................................... Config: Remove references for Cassandra 2 Bug: T179419 Change-Id: Ibdb1b31ec4d1e54a3c630820d7aa4c43cf1e78ea --- M scap/environments/beta/vars.yaml M scap/templates/config.yaml.j2 M scap/vars.yaml 3 files changed, 1 insertion(+), 46 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/35/402035/1 diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml index c81c54a..8b30741 100644 --- a/scap/environments/beta/vars.yaml +++ b/scap/environments/beta/vars.yaml @@ -2,7 +2,6 @@ salt_key: '123456' page_size: 10 user_agent: RESTBase/deployment-prep -storage_groups: [] storage_groups_ng: [] cassandra_default_consistency: localOne summary_impl: mcs diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2 index 801b8fd..21a3524 100644 --- a/scap/templates/config.yaml.j2 +++ b/scap/templates/config.yaml.j2 @@ -53,27 +53,6 @@ x-modules: - path: projects/wmf_default.yaml options: &default_options - table: - backend: cassandra - hosts: ['<%= seeds|join("','") %>'] - keyspace: system - localDc: <%= cassandra_local_dc %> - datacenters: ['<%= cassandra_datacenters|join("','") %>'] - username: <%= cassandra_user %> - password: <%= cassandra_password %> - defaultConsistency: <%= cassandra_default_consistency %> - <% if cassandra_tls is not none and cassandra_tls|length > 0 %>tls:<% for key, value in cassandra_tls.iteritems() %> - <%= key %>: <%= value -%> -<% endfor -%> -<% endif %> - storage_groups: - <%- for group in storage_groups %> - - name: <%= group.name %> - domains: <%= group.domains %> - <%- endfor %> - # Catch-all group - - name: default.group.local - domains: /./ table_ng: backend: cassandra-ng hosts: ['<%= seeds_ng|join("','") if seeds_ng|length > 0 else seeds|join("','") %>'] diff --git a/scap/vars.yaml b/scap/vars.yaml index 521d1aa..7a728cb 100644 --- a/scap/vars.yaml +++ b/scap/vars.yaml @@ -12,7 +12,7 @@ mwapi_uri: http://localhost/w/api.php ipaddress: '127.0.0.1' rl_seeds: [] -seeds: ['localhost'] +seeds_ng: ['localhost'] cassandra_local_dc: testdc cassandra_datacenters: ['testdc'] cassandra_user: cassandra @@ -35,29 +35,6 @@ salt_key: '123456' page_size: 10 user_agent: RESTBase/WMF -storage_groups: - - name: phase0.group.local - domains: /^(?:test.*\.wiki.*\.org|www.mediawiki.org)$/ - - name: wikipedia.group.local - domains: /\.wikipedia\.org$/ - - name: wikimedia.group.local - domains: /\.wikimedia\.org$/ - - name: wiktionary.group.local - domains: /\.wiktionary\.org$/ - - name: wikibooks.group.local - domains: /\.wikibooks\.org$/ - - name: wikisource.group.local - domains: /\.wikisource\.org$/ - - name: wikiquote.group.local - domains: /\.wikiquote\.org$/ - - name: wikinews.group.local - domains: /\.wikinews\.org$/ - - name: wikiversity.group.local - domains: /\.wikiversity\.org$/ - - name: wikivoyage.group.local - domains: /\.wikivoyage\.org$/ - - name: globaldomain.group.local - domains: /^wikimedia\.org$/ storage_groups_ng: - name: enwiki domains: /^en\.wikipedia\.org$/ -- To view, visit https://gerrit.wikimedia.org/r/402035 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibdb1b31ec4d1e54a3c630820d7aa4c43cf1e78ea Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac <mobro...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits