Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350393 )

Change subject: ores: Move the application (web+worker) to profiles
......................................................................

ores: Move the application (web+worker) to profiles

Move the old web and worker role classes that comprised the ores roles
to profiles and include them in the scb role class. That makes the code
more conformant to our Puppet coding guidelines, decouples more
effectively the worker from the web app and recouples them at the role
level.

Change-Id: I2a03d911a3a3bcd2f11658c8fbbbaede4ba473ea
---
A modules/profile/manifests/ores/web.pp
A modules/profile/manifests/ores/worker.pp
M modules/role/manifests/scb.pp
3 files changed, 9 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/350393/1

diff --git a/modules/profile/manifests/ores/web.pp 
b/modules/profile/manifests/ores/web.pp
new file mode 100644
index 0000000..3c29788
--- /dev/null
+++ b/modules/profile/manifests/ores/web.pp
@@ -0,0 +1,3 @@
+class profile::ores::web {
+    include ::ores::web
+}
diff --git a/modules/profile/manifests/ores/worker.pp 
b/modules/profile/manifests/ores/worker.pp
new file mode 100644
index 0000000..fc3e597
--- /dev/null
+++ b/modules/profile/manifests/ores/worker.pp
@@ -0,0 +1,3 @@
+class profile::ores::worker {
+    include ::ores::worker
+}
diff --git a/modules/role/manifests/scb.pp b/modules/role/manifests/scb.pp
index 9d1d435..585cf34 100644
--- a/modules/role/manifests/scb.pp
+++ b/modules/role/manifests/scb.pp
@@ -1,14 +1,15 @@
 # "Compendium" class for nodes supporting various *oid services
 # This class is an intermediate step to better design
 class role::scb {
+    include ::profile::ores::worker
+    include ::profile::ores::web
+
     include role::mobileapps
     include role::mathoid
     include role::graphoid
     include role::citoid
     include role::cxserver
     include role::changeprop
-    include role::ores::web
-    include role::ores::worker
     include role::apertium
     include role::eventstreams
     include role::pdfrender

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a03d911a3a3bcd2f11658c8fbbbaede4ba473ea
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>

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

Reply via email to