jenkins-bot has submitted this change and it was merged.

Change subject: Update queue settings for payments role
......................................................................


Update queue settings for payments role

Add settings for Redis versions of all the new queues, turn on
mirroring for everything that's still in development, switch pending
queue completely over to Redis.

Also updates inst-args to consumer-parameters.

Change-Id: I3b7bb633f32c6c23560cceda6188b16b35651583
---
M puppet/modules/payments/manifests/donation_interface.pp
M puppet/modules/smashpig/templates/SmashPig.yaml.erb
2 files changed, 85 insertions(+), 18 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/modules/payments/manifests/donation_interface.pp 
b/puppet/modules/payments/manifests/donation_interface.pp
index 539c410..e0a5ed1 100644
--- a/puppet/modules/payments/manifests/donation_interface.pp
+++ b/puppet/modules/payments/manifests/donation_interface.pp
@@ -5,18 +5,19 @@
 
   mediawiki::extension { 'payments:DonationInterface':
     settings     => {
-      wgGlobalCollectGatewayEnabled            => true,
-      wgAdyenGatewayEnabled                    => true,
-      wgAmazonGatewayEnabled                   => true,
-      wgAstroPayGatewayEnabled                 => true,
-      wgPaypalGatewayEnabled                   => true,
-      wgDonationInterfaceEnableFormChooser     => true,
-      wgDonationInterfaceEnableQueue           => true,
-      wgDonationInterfaceEnableSystemStatus    => true,
-      wgDonationInterfaceEnableFunctionsFilter => true,
-      wgDonationInterfaceEnableMinfraud        => false,
-      wgDonationInterfaceEnableReferrerFilter  => true,
-      wgDonationInterfaceEnableSourceFilter    => true,
+      wgGlobalCollectGatewayEnabled             => true,
+      wgAdyenGatewayEnabled                     => true,
+      wgAmazonGatewayEnabled                    => true,
+      wgAstroPayGatewayEnabled                  => true,
+      wgPaypalGatewayEnabled                    => true,
+      wgDonationInterfaceEnableFormChooser      => true,
+      wgDonationInterfaceEnableBannerHistoryLog => true,
+      wgDonationInterfaceEnableQueue            => true,
+      wgDonationInterfaceEnableSystemStatus     => true,
+      wgDonationInterfaceEnableFunctionsFilter  => true,
+      wgDonationInterfaceEnableMinfraud         => false,
+      wgDonationInterfaceEnableReferrerFilter   => true,
+      wgDonationInterfaceEnableSourceFilter     => true,
 
       wgDonationInterfaceTest                  => true,
 
@@ -55,8 +56,28 @@
           'expiry'    => 3600,
           'order_key' => 'date',
         },
-        'pending-new'            => {
-          'queue'   => 'pending',
+        'pending'                => {
+          'type'    => 'PHPQueue\Backend\Predis',
+          'servers' => 'tcp://localhost',
+          'expiry'  => 3600,
+        },
+        'complete-new'           => {
+          'queue'   => 'donations',
+          'type'    => 'PHPQueue\Backend\Predis',
+          'servers' => 'tcp://localhost',
+          'expiry'  => 3600,
+        },
+        'banner-history'     => {
+          'type'    => 'PHPQueue\Backend\Predis',
+          'servers' => 'tcp://localhost',
+          'expiry'  => 3600,
+        },
+        'payments-antifraud' => {
+          'type'    => 'PHPQueue\Backend\Predis',
+          'servers' => 'tcp://localhost',
+          'expiry'  => 3600,
+        },
+        'payments-init'      => {
           'type'    => 'PHPQueue\Backend\Predis',
           'servers' => 'tcp://localhost',
           'expiry'  => 3600,
@@ -64,8 +85,8 @@
       },
 
       wgDonationInterfaceQueueMirrors          => {
-        'globalcollect-cc-limbo' => 'pending-new',
-        'pending'                => 'pending-new',
+        'globalcollect-cc-limbo' => 'pending',
+        'complete'               => 'complete-new',
       },
 
       wgDonationInterfaceOrphanCron            => {
diff --git a/puppet/modules/smashpig/templates/SmashPig.yaml.erb 
b/puppet/modules/smashpig/templates/SmashPig.yaml.erb
index b8928a4..7a4b3e0 100644
--- a/puppet/modules/smashpig/templates/SmashPig.yaml.erb
+++ b/puppet/modules/smashpig/templates/SmashPig.yaml.erb
@@ -1,11 +1,57 @@
 default:
     data-store:
-        pending-db:
-            inst-args:
+        # FIXME some way to reuse this between config files
+        redis: &REDIS
+            servers:
+                scheme: tcp
+                host: 127.0.0.1
+                port: 6379
+
+        mysql: &MYSQL
+            class: PDO
+            constructor-parameters:
                 - mysql:host=127.0.0.1;dbname=smashpig
                 - root
                 - "<%= scope.lookupvar('mysql::root_password') %>"
 
+        pending-db:
+            <<: *MYSQL
+
+        damaged-db:
+            <<: *MYSQL
+
+        banner-history:
+            class: PHPQueue\Backend\Predis
+            constructor-parameters:
+                -
+                    <<: *REDIS
+                    queue: 'banner-history'
+
+        recurring:
+            constructor-parameters:
+                -
+                    - recurring-stomp
+                    - recurring-new
+
+        refund:
+            constructor-parameters:
+                -
+                    - refund-stomp
+                    - refund-new
+
+        verified:
+            constructor-parameters:
+                -
+                    - verified-stomp
+                    - donations
+
+        payments-init:
+            class: PHPQueue\Backend\Predis
+            constructor-parameters:
+                -
+                    <<: *REDIS
+                    queue: payments-init
+
 adyen:
     payment-provider:
         adyen:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b7bb633f32c6c23560cceda6188b16b35651583
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Cdentinger <cdentin...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: XenoRyet <dkozlow...@wikimedia.org>
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