[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Add the table_ng options and new storage groups

2017-09-20 Thread Mobrovac (Code Review) 
Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/378912 )

Change subject: Config: Add the table_ng options and new storage groups
..


Config: Add the table_ng options and new storage groups

Bug: T169940
Bug: T172224
Change-Id: I9e23fba5942f6ca8b4de55c7b604e1e35f38a309
---
M scap/environments/beta/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
3 files changed, 32 insertions(+), 1 deletion(-)

Approvals:
  Eevans: Looks good to me, but someone else must approve
  Mobrovac: Verified; Looks good to me, approved
  GWicke: Looks good to me, but someone else must approve
  Ppchelko: Looks good to me, but someone else must approve



diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
index 44429cd..80069e9 100644
--- a/scap/environments/beta/vars.yaml
+++ b/scap/environments/beta/vars.yaml
@@ -2,6 +2,7 @@
 page_size: 10
 user_agent: RESTBase/deployment-prep
 storage_groups: []
+storage_groups_ng: []
 cassandra_default_consistency: localOne
 domains:
   BetaCluster:
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index a60f575..40144c9 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -74,6 +74,27 @@
 # 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("','") %>']
+  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_ng %>
+- name: <%= group.name %>
+  domains: <%= group.domains %>
+  <%- endfor %>
+# Catch-all group
+- name: others
+  domains: /./
 parsoid:
   host: <%= parsoid_uri %>
 action:
@@ -197,4 +218,4 @@
   user_agent: <%= user_agent %>
   ui_name: RESTBase
   ui_url: https://www.mediawiki.org/wiki/RESTBase
-  ui_title: RESTBase docs
\ No newline at end of file
+  ui_title: RESTBase docs
diff --git a/scap/vars.yaml b/scap/vars.yaml
index bf0c5d4..870caa0 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -57,6 +57,15 @@
 domains: /\.wikivoyage\.org$/
   - name: globaldomain.group.local
 domains: /^wikimedia\.org$/
+storage_groups_ng:
+  - name: enwiki
+domains: /^en\.wikipedia\.org$/
+  - name: commons
+domains: /^commons\.wikimedia\.org$/
+  - name: globaldomain
+domains: /^wikimedia\.org$/
+  - name: wikipedia
+domains: /\.wikipedia\.org$/
 domains:
   Wikipedia:
 ab.wikipedia.org: default_project

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e23fba5942f6ca8b4de55c7b604e1e35f38a309
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Eevans 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Add the table_ng options and new storage groups

2017-09-19 Thread Mobrovac (Code Review) 
Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/378912 )

Change subject: Config: Add the table_ng options and new storage groups
..

Config: Add the table_ng options and new storage groups

Bug: T169940
Bug: T172224
Change-Id: I9e23fba5942f6ca8b4de55c7b604e1e35f38a309
---
M scap/environments/beta/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
3 files changed, 32 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/12/378912/1

diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
index 44429cd..80069e9 100644
--- a/scap/environments/beta/vars.yaml
+++ b/scap/environments/beta/vars.yaml
@@ -2,6 +2,7 @@
 page_size: 10
 user_agent: RESTBase/deployment-prep
 storage_groups: []
+storage_groups_ng: []
 cassandra_default_consistency: localOne
 domains:
   BetaCluster:
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index a60f575..9ea6d4c 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -74,6 +74,27 @@
 # Catch-all group
 - name: default.group.local
   domains: /./
+table_ng:
+  backend: cassandra
+  hosts: ['<%= seeds_ng|join("','") if seeds_ng|length > 0 else 
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_ng %>
+- name: <%= group.name %>
+  domains: <%= group.domains %>
+  <%- endfor %>
+# Catch-all group
+- name: others
+  domains: /./
 parsoid:
   host: <%= parsoid_uri %>
 action:
@@ -197,4 +218,4 @@
   user_agent: <%= user_agent %>
   ui_name: RESTBase
   ui_url: https://www.mediawiki.org/wiki/RESTBase
-  ui_title: RESTBase docs
\ No newline at end of file
+  ui_title: RESTBase docs
diff --git a/scap/vars.yaml b/scap/vars.yaml
index bf0c5d4..870caa0 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -57,6 +57,15 @@
 domains: /\.wikivoyage\.org$/
   - name: globaldomain.group.local
 domains: /^wikimedia\.org$/
+storage_groups_ng:
+  - name: enwiki
+domains: /^en\.wikipedia\.org$/
+  - name: commons
+domains: /^commons\.wikimedia\.org$/
+  - name: globaldomain
+domains: /^wikimedia\.org$/
+  - name: wikipedia
+domains: /\.wikipedia\.org$/
 domains:
   Wikipedia:
 ab.wikipedia.org: default_project

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e23fba5942f6ca8b4de55c7b604e1e35f38a309
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits