Alexandros Kosiaris has submitted this change and it was merged.

Change subject: ores: do git clone in staging
......................................................................


ores: do git clone in staging

otherwise it causes things like this:
https://gist.github.com/halfak/ed056f71d23d619a9ce3938daaebbc44

Change-Id: I3cf9f769dc4f794d790ea3d15376083e3ca8dea4
---
M modules/role/manifests/labs/ores/staging.pp
1 file changed, 19 insertions(+), 4 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/role/manifests/labs/ores/staging.pp 
b/modules/role/manifests/labs/ores/staging.pp
index dffddc9..5949aac 100644
--- a/modules/role/manifests/labs/ores/staging.pp
+++ b/modules/role/manifests/labs/ores/staging.pp
@@ -1,8 +1,5 @@
 class role::labs::ores::staging {
-    class { 'ores::base':
-        branch => 'master',
-    }
-
+    include ::ores::base
     include ::ores::web
     include ::ores::worker
     include ::ores::flower
@@ -14,6 +11,24 @@
         queue_maxmemory => '256M',
     }
 
+    file { '/srv/ores':
+        ensure => directory,
+        owner  => 'www-data',
+        group  => 'www-data',
+        mode   => '0775',
+    }
+
+    git::clone { 'ores-wm-config':
+        ensure    => present,
+        origin    => 'https://github.com/wiki-ai/ores-wikimedia-config.git',
+        directory => $ores::base::config_path,
+        branch    => 'master',
+        owner     => 'www-data',
+        group     => 'www-data',
+        require   => File['/srv/ores'],
+        before    => Class['ores::config'],
+    }
+
     ores::config { 'staging':
         config   => {
             'score_caches'     => {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3cf9f769dc4f794d790ea3d15376083e3ca8dea4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ladsgroup <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to