[MediaWiki-commits] [Gerrit] ores: Mark all roles requiring ores::base properly - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/231761

Change subject: ores: Mark all roles requiring ores::base properly
......................................................................

ores: Mark all roles requiring ores::base properly

Change-Id: I0ed748b1feb5bbe9e9ebfd277b40c0d38528c9b4
---
M manifests/role/labsores.pp
M modules/ores/manifests/flower.pp
M modules/ores/manifests/precached.pp
M modules/ores/manifests/web.pp
M modules/ores/manifests/worker.pp
5 files changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/61/231761/1

diff --git a/manifests/role/labsores.pp b/manifests/role/labsores.pp
index 155935a..094db59 100644
--- a/manifests/role/labsores.pp
+++ b/manifests/role/labsores.pp
@@ -1,22 +1,18 @@
 class role::labs::ores::precached {
-    include ::ores::base
     include ::ores::precached
 }
 
 class role::labs::ores::web {
-    include ::ores::base
     include ::ores::web
     include ::ores::redisproxy
 }
 
 class role::labs::ores::flower {
-    include ::ores::base
     include ::ores::flower
     include ::ores::redisproxy
 }
 
 class role::labs::ores::worker {
-    include ::ores::base
     include ::ores::worker
     include ::ores::redisproxy
 }
diff --git a/modules/ores/manifests/flower.pp b/modules/ores/manifests/flower.pp
index 570a694..cb8acb7 100644
--- a/modules/ores/manifests/flower.pp
+++ b/modules/ores/manifests/flower.pp
@@ -4,6 +4,8 @@
 # Users should use ssh port forwarding to access the
 # instance.
 class ores::flower {
+    require ores::base
+
     celery::flower { 'ores':
         app             => 'ores_celery.application',
         working_dir     => $ores::base::config_path,
diff --git a/modules/ores/manifests/precached.pp 
b/modules/ores/manifests/precached.pp
index bcd97cd..da03b2e 100644
--- a/modules/ores/manifests/precached.pp
+++ b/modules/ores/manifests/precached.pp
@@ -1,6 +1,8 @@
 # = Class: ores::precached
 # Run a pre-caching daemon that listens to RCStream
 class ores::precached {
+    require ores::base
+
     $working_dir = $::ores::base::config_path
     $venv_path  = $::ores::base::venv_path
 
diff --git a/modules/ores/manifests/web.pp b/modules/ores/manifests/web.pp
index f755bd7..436f68f 100644
--- a/modules/ores/manifests/web.pp
+++ b/modules/ores/manifests/web.pp
@@ -1,6 +1,8 @@
 # = Class: ores::web
 # Sets up a uwsgi based web server for ORES running python3
 class ores::web {
+    require ores::base
+
     # ORES is a python3 application \o/
     require_package('uwsgi-plugin-python3')
 
diff --git a/modules/ores/manifests/worker.pp b/modules/ores/manifests/worker.pp
index 7ebb02c..6fa85f6 100644
--- a/modules/ores/manifests/worker.pp
+++ b/modules/ores/manifests/worker.pp
@@ -1,4 +1,6 @@
 class ores::worker {
+    require ores::base
+
     celery::worker { 'ores-worker':
         app             => 'ores_celery.application',
         working_dir     => $ores::base::config_path,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ed748b1feb5bbe9e9ebfd277b40c0d38528c9b4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>

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