[MediaWiki-commits] [Gerrit] operations/puppet[production]: wdqs - remove trebuchet based deployment

[Gehel (Code Review)]

Gehel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/343302 )

Change subject: wdqs - remove trebuchet based deployment
......................................................................

wdqs - remove trebuchet based deployment

Now that all wdqs servers have moved to scap 3, trebuchet isn't used anymore.

Change-Id: Ifc7143794f34763c3c09ab5aa0541522ec90a83b
---
M modules/wdqs/manifests/init.pp
M modules/wdqs/manifests/service.pp
2 files changed, 13 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/343302/1

diff --git a/modules/wdqs/manifests/init.pp b/modules/wdqs/manifests/init.pp
index 7e2e4d2..35082e9 100644
--- a/modules/wdqs/manifests/init.pp
+++ b/modules/wdqs/manifests/init.pp
@@ -37,7 +37,11 @@
         managehome => no,
     }
 
-    include ::wdqs::service
+    class { 'wdqs::service':
+        deploy_user => $deploy_user,
+        package_dir => $package_dir,
+        username => $username,
+    }
 
     file { $log_dir:
         ensure  => directory,
@@ -105,13 +109,6 @@
 
     # WDQS Updater service
     include wdqs::updater
-
-    # Deployment
-    scap::target { 'wdqs/wdqs':
-        service_name => 'wdqs-blazegraph',
-        deploy_user  => $deploy_user,
-        manage_user  => true,
-    }
 
     # GC logs rotation is done by the JVM, but on JVM restart, the logs left by
     # the previous instance are left alone. This cron takes care of cleaning up
diff --git a/modules/wdqs/manifests/service.pp 
b/modules/wdqs/manifests/service.pp
index ee27ebb..ace50d6 100644
--- a/modules/wdqs/manifests/service.pp
+++ b/modules/wdqs/manifests/service.pp
@@ -3,8 +3,9 @@
 # Provisions WDQS service package
 #
 class wdqs::service(
-    $package_dir=$::wdqs::package_dir,
-    $username=$::wdqs::username,
+    $deploy_user,
+    $package_dir,
+    $username,
     $config_file='RWStore.properties',
 ) {
 
@@ -12,10 +13,11 @@
 
     if $::wdqs::use_git_deploy {
 
-        package { 'wdqs':
-            ensure   => present,
-            provider => 'trebuchet',
-            require  => User[$username],
+        # Deployment
+        scap::target { 'wdqs/wdqs':
+            service_name => 'wdqs-blazegraph',
+            deploy_user  => $deploy_user,
+            manage_user  => true,
         }
 
         $git_deploy_dir = '/srv/deployment/wdqs/wdqs'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc7143794f34763c3c09ab5aa0541522ec90a83b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org>

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