Yuvipanda has submitted this change and it was merged.

Change subject: ores: Setup separate staging config
......................................................................


ores: Setup separate staging config

Change-Id: If03ca94060845457a34f152c1902dacfe7aad8b4
---
M manifests/role/labsores.pp
A modules/ores/manifests/config.pp
2 files changed, 29 insertions(+), 2 deletions(-)

Approvals:
  Yuvipanda: Verified; Looks good to me, approved



diff --git a/manifests/role/labsores.pp b/manifests/role/labsores.pp
index 4c29d7c..930bdca 100644
--- a/manifests/role/labsores.pp
+++ b/manifests/role/labsores.pp
@@ -57,7 +57,21 @@
         queue_maxmemory => '256M',
     }
 
-    class { '::ores::redisproxy':
-        server => 'localhost',
+    ores::config::staging { 'staging':
+        settings => {
+            'score_caches'     => {
+                'ores_redis' => {
+                    'host' => '127.0.0.1',
+                    'port' => '6380',
+                }
+            },
+            'score_processors' => {
+                'ores_celery' => {
+                    'BROKER_URL'            => 'redis://127.0.0.1:6379',
+                    'CELERY_RESULT_BACKEND' => 'redis://127.0.0.1:6379',
+                }
+            }
+        },
+        priority => '99',
     }
 }
diff --git a/modules/ores/manifests/config.pp b/modules/ores/manifests/config.pp
new file mode 100644
index 0000000..a74bed8
--- /dev/null
+++ b/modules/ores/manifests/config.pp
@@ -0,0 +1,13 @@
+define ores::config(
+    $priority,
+    $config,
+) {
+    require ::ores::base
+
+    file { "${::ores::base::config_path}/config/${priority}-${title}.yaml":
+        content => ordered_yaml($config),
+        owner   => 'www-data',
+        group   => 'www-data',
+        mode    => '0660',
+    }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If03ca94060845457a34f152c1902dacfe7aad8b4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to