Dzahn has submitted this change and it was merged.

Change subject: aqs and restbase: Fix variable contains an uppercase letter
......................................................................


aqs and restbase: Fix variable contains an uppercase letter

Bug: T93645
Change-Id: I20d1ebc196c5f802d96523e04c569ab5b404a1f7
---
M hieradata/labs/deployment-prep/common.yaml
M hieradata/role/common/aqs.yaml
M hieradata/role/common/restbase.yaml
M modules/aqs/manifests/init.pp
M modules/aqs/templates/config.yaml.erb
M modules/restbase/manifests/init.pp
M modules/restbase/templates/config.labs.yaml.erb
M modules/restbase/templates/config.yaml.erb
8 files changed, 20 insertions(+), 20 deletions(-)

Approvals:
  Mobrovac: Looks good to me, but someone else must approve
  Dzahn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index ac811c7..5d06d4e 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -111,7 +111,7 @@
 restbase::parsoid_uri: 
http://deployment-parsoid09.deployment-prep.eqiad.wmflabs:8000
 restbase::statsd_host: labmon1001.eqiad.wmnet
 restbase::logstash_host: deployment-logstash2.deployment-prep.eqiad.wmflabs
-restbase::cassandra_defaultConsistency: localQuorum
+restbase::cassandra_default_consistency: localQuorum
 restbase::graphoid_uri: 
http://deployment-sca01.deployment-prep.eqiad.wmflabs:19000
 restbase::mobileapps_uri: http://appservice.wmflabs.org
 restbase::mathoid_uri: 
http://deployment-mathoid.deployment-prep.eqiad.wmflabs:10042
diff --git a/hieradata/role/common/aqs.yaml b/hieradata/role/common/aqs.yaml
index 3831ed6..d2c8064 100644
--- a/hieradata/role/common/aqs.yaml
+++ b/hieradata/role/common/aqs.yaml
@@ -61,8 +61,8 @@
     - aqs1002.eqiad.wmnet
     - aqs1003.eqiad.wmnet
 aqs::logstash_host: logstash1001.eqiad.wmnet
-aqs::cassandra_defaultConsistency: localOne
-aqs::cassandra_localDc: "%{::site}"
+aqs::cassandra_default_consistency: localOne
+aqs::cassandra_local_dc: "%{::site}"
 aqs::statsd_host: statsd.eqiad.wmnet
 
 lvs::realserver::realserver_ips:
diff --git a/hieradata/role/common/restbase.yaml 
b/hieradata/role/common/restbase.yaml
index cee6b0e..91c78ee 100644
--- a/hieradata/role/common/restbase.yaml
+++ b/hieradata/role/common/restbase.yaml
@@ -4,8 +4,8 @@
 cluster: restbase
 restbase::port: 7231
 restbase::logstash_host: logstash1002.eqiad.wmnet
-restbase::cassandra_defaultConsistency: localQuorum
-restbase::cassandra_localDc: "%{::site}"
+restbase::cassandra_default_consistency: localQuorum
+restbase::cassandra_local_dc: "%{::site}"
 restbase::cassandra_datacenters:
     - "eqiad"
     - "codfw"
diff --git a/modules/aqs/manifests/init.pp b/modules/aqs/manifests/init.pp
index eb1e385..49590a8 100644
--- a/modules/aqs/manifests/init.pp
+++ b/modules/aqs/manifests/init.pp
@@ -14,11 +14,11 @@
 #   Array of cassandra hosts (IP or host names) to contact.
 #   Default: ['localhost']
 #
-# [*cassandra_defaultConsistency*]
+# [*cassandra_default_consistency*]
 #   Default cassandra query consistency level. Typically 'one' or
 #   'localQuorum'. Default: 'localQuorum'.
 #
-# [*cassandra_localDc*]
+# [*cassandra_local_dc*]
 #   Which DC should be considered local. Default: 'datacenter1'.
 #
 # [*cassandra_datacenters*]
@@ -47,8 +47,8 @@
     $cassandra_user = 'cassandra',
     $cassandra_password = 'cassandra',
     $seeds          = [$::ipaddress],
-    $cassandra_defaultConsistency = 'localQuorum',
-    $cassandra_localDc = 'datacenter1',
+    $cassandra_default_consistency = 'localQuorum',
+    $cassandra_local_dc = 'datacenter1',
     $cassandra_datacenters = [ 'datacenter1' ],
     $port           = 7232,
     $salt_key       = 'secretkey',
diff --git a/modules/aqs/templates/config.yaml.erb 
b/modules/aqs/templates/config.yaml.erb
index 79d6579..2803fe3 100644
--- a/modules/aqs/templates/config.yaml.erb
+++ b/modules/aqs/templates/config.yaml.erb
@@ -8,11 +8,11 @@
           table:
             hosts: [<%= Array(@seeds).join(',') %>]
             keyspace: system
-            localDc: <%= @cassandra_localDc %>
-            datacenters: [<%= @cassandra_localDc %>]
+            localDc: <%= @cassandra_local_dc %>
+            datacenters: [<%= @cassandra_local_dc %>]
             username: <%= @cassandra_user %>
             password: <%= @cassandra_password %>
-            defaultConsistency: <%= @cassandra_defaultConsistency %>
+            defaultConsistency: <%= @cassandra_default_consistency %>
             storage_groups:
               # Catch-all group
               - name: default.group.local
diff --git a/modules/restbase/manifests/init.pp 
b/modules/restbase/manifests/init.pp
index 1bd6ae3..982116e 100644
--- a/modules/restbase/manifests/init.pp
+++ b/modules/restbase/manifests/init.pp
@@ -15,11 +15,11 @@
 #   Array of cassandra hosts (IP or host names) to contact.
 #   Default: ['localhost']
 #
-# [*cassandra_defaultConsistency*]
+# [*cassandra_default_consistency*]
 #   Default cassandra query consistency level. Typically 'one' or
 #   'localQuorum'. Default: 'localQuorum'.
 #
-# [*cassandra_localDc*]
+# [*cassandra_local_dc*]
 #   Which DC should be considered local. Default: 'datacenter1'.
 #
 # [*cassandra_datacenters*]
@@ -87,8 +87,8 @@
     $cassandra_user = 'cassandra',
     $cassandra_password = 'cassandra',
     $seeds          = [$::ipaddress],
-    $cassandra_defaultConsistency = 'localQuorum',
-    $cassandra_localDc = 'datacenter1',
+    $cassandra_default_consistency = 'localQuorum',
+    $cassandra_local_dc = 'datacenter1',
     $cassandra_datacenters = [ 'datacenter1' ],
     $port           = 7231,
     $salt_key       = 'secretkey',
diff --git a/modules/restbase/templates/config.labs.yaml.erb 
b/modules/restbase/templates/config.labs.yaml.erb
index 0037bb9..8ff6cf6 100644
--- a/modules/restbase/templates/config.labs.yaml.erb
+++ b/modules/restbase/templates/config.labs.yaml.erb
@@ -18,11 +18,11 @@
           backend: cassandra
           hosts: [<%= Array(@seeds).join(',') %>]
           keyspace: system
-          localDc: <%= @cassandra_localDc %>
+          localDc: <%= @cassandra_local_dc %>
           datacenters: [<%= Array(@cassandra_datacenters).join(',') %>]
           username: <%= @cassandra_user %>
           password: <%= @cassandra_password %>
-          defaultConsistency: <%= @cassandra_defaultConsistency %>
+          defaultConsistency: <%= @cassandra_default_consistency %>
           storage_groups:
             # Catch-all group
             - name: default.group.local
diff --git a/modules/restbase/templates/config.yaml.erb 
b/modules/restbase/templates/config.yaml.erb
index 8cd9690..920396d 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -18,11 +18,11 @@
           backend: cassandra
           hosts: [<%= Array(@seeds).join(',') %>]
           keyspace: system
-          localDc: <%= @cassandra_localDc %>
+          localDc: <%= @cassandra_local_dc %>
           datacenters: [<%= Array(@cassandra_datacenters).join(',') %>]
           username: <%= @cassandra_user %>
           password: <%= @cassandra_password %>
-          defaultConsistency: <%= @cassandra_defaultConsistency %>
+          defaultConsistency: <%= @cassandra_default_consistency %>
           storage_groups:
             - name: phase0.group.local
               domains:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I20d1ebc196c5f802d96523e04c569ab5b404a1f7
Gerrit-PatchSet: 10
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Eevans <eev...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to