Elukey has submitted this change and it was merged.
Change subject: Switch the AQS restbase use from 'cassandra' to 'aqs'
......................................................................
Switch the AQS restbase use from 'cassandra' to 'aqs'
The aqs user has been created and tested, data is returned
correctly. The plan would be to:
1) disable puppet on aqs100[123]
2) depool via conftool aqs1001
3) run puppet on aqs1001 and test
4) re-pool aqs1001 and check again
5) do the same with aqs100[23]
Changes for aqs100[456] will be a no-op.
Bug: T142073
Change-Id: Ieac245d026daae7787d0013002a322a83be1194c
---
M hieradata/hosts/aqs1004.yaml
M hieradata/hosts/aqs1005.yaml
M hieradata/hosts/aqs1006.yaml
M hieradata/role/common/aqs.yaml
4 files changed, 6 insertions(+), 15 deletions(-)
Approvals:
Elukey: Looks good to me, approved
Ottomata: Looks good to me, but someone else must approve
Eevans: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/hieradata/hosts/aqs1004.yaml b/hieradata/hosts/aqs1004.yaml
index 72292e8..1f3804b 100644
--- a/hieradata/hosts/aqs1004.yaml
+++ b/hieradata/hosts/aqs1004.yaml
@@ -26,11 +26,6 @@
cassandra::target_version: '2.2'
-# This configuration forces Restbase to use a specific user. Please make sure
-# to create the user first.
-aqs::cassandra_user: aqs
-aqs::cassandra_password: "%{passwords::aqs::aqs_user}"
-
# Special compaction settings, following suggesions in:
#
https://docs.datastax.com/en/cassandra/2.1/cassandra/configuration/configCassandra_yaml_r.html
# All values are divided by two since we have two instances running on each
node
diff --git a/hieradata/hosts/aqs1005.yaml b/hieradata/hosts/aqs1005.yaml
index 438617e..497cadf 100644
--- a/hieradata/hosts/aqs1005.yaml
+++ b/hieradata/hosts/aqs1005.yaml
@@ -26,11 +26,6 @@
cassandra::target_version: '2.2'
-# This configuration forces Restbase to use a specific user. Please make sure
-# to create the user first.
-aqs::cassandra_user: aqs
-aqs::cassandra_password: "%{passwords::aqs::aqs_user}"
-
# Special compaction settings, following suggesions in:
#
https://docs.datastax.com/en/cassandra/2.1/cassandra/configuration/configCassandra_yaml_r.html
# All values are divided by two since we have two instances running on each
node
diff --git a/hieradata/hosts/aqs1006.yaml b/hieradata/hosts/aqs1006.yaml
index 4e89128..942a83c 100644
--- a/hieradata/hosts/aqs1006.yaml
+++ b/hieradata/hosts/aqs1006.yaml
@@ -26,11 +26,6 @@
cassandra::target_version: '2.2'
-# This configuration forces Restbase to use a specific user. Please make sure
-# to create the user first.
-aqs::cassandra_user: aqs
-aqs::cassandra_password: "%{passwords::aqs::aqs_user}"
-
# Special compaction settings, following suggesions in:
#
https://docs.datastax.com/en/cassandra/2.1/cassandra/configuration/configCassandra_yaml_r.html
# All values are divided by two since we have two instances running on each
node
diff --git a/hieradata/role/common/aqs.yaml b/hieradata/role/common/aqs.yaml
index 509be6a..5a30cf2 100644
--- a/hieradata/role/common/aqs.yaml
+++ b/hieradata/role/common/aqs.yaml
@@ -37,12 +37,18 @@
cassandra::permissions_validity_in_ms: 600000
# AQS Cassandra user
+
# This configuration creates the adduser.cql script that must be used
# to create the new user on the Cassandra cluster. This configuration alone
# does not create any user on the Cassandra cluster.
cassandra::application_username: aqs
cassandra::application_password: "%{passwords::aqs::aqs_user}"
+# This configuration forces Restbase to use a specific user. Please make sure
+# to create the user first.
+aqs::cassandra_user: aqs
+aqs::cassandra_password: "%{passwords::aqs::aqs_user}"
+
cassandra::dc: "%{::site}"
cassandra::cluster_name: "Analytics Query Service Cassandra"
--
To view, visit https://gerrit.wikimedia.org/r/303798
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieac245d026daae7787d0013002a322a83be1194c
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Eevans <eev...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Joal <j...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
