[MediaWiki-commits] [Gerrit] operations/puppet[production]: thumbor, swift: convert to systemd::service and systemd::unit

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371618 )

Change subject: thumbor,swift: convert to systemd::service and systemd::unit
......................................................................

thumbor,swift: convert to systemd::service and systemd::unit

Bug: T173078
Change-Id: I08ed0928adde65be47ff68c4619578dd5706ba37
---
M modules/swift/manifests/proxy.pp
M modules/thumbor/manifests/init.pp
2 files changed, 8 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/371618/1

diff --git a/modules/swift/manifests/proxy.pp b/modules/swift/manifests/proxy.pp
index 6b3ceba..d26693a 100644
--- a/modules/swift/manifests/proxy.pp
+++ b/modules/swift/manifests/proxy.pp
@@ -53,9 +53,8 @@
     # start swift-proxy, our proxy binds to port 80 so it isn't going to work.
     # Use a modified version of 'swift-proxy' systemd unit from 
jessie-backports.
     if os_version('debian >= jessie') {
-        base::service_unit { 'swift-proxy':
-            systemd => true,
-            refresh => false,
+        systemd::service { 'swift-proxy':
+            content => systemd_template('swift-proxy'),
         }
     }
 
diff --git a/modules/thumbor/manifests/init.pp 
b/modules/thumbor/manifests/init.pp
index 5aee764..f68cb0d 100644
--- a/modules/thumbor/manifests/init.pp
+++ b/modules/thumbor/manifests/init.pp
@@ -107,16 +107,15 @@
         creates => '/etc/systemd/system/thumbor.service',
     }
 
-    base::service_unit { 'thumbor@':
-        ensure          => present,
-        systemd         => true,
-        declare_service => false,
-        require         => Package['python-thumbor-wikimedia'],
+    systemd::unit { 'thumbor@':
+        ensure  => present,
+        content => systemd_template('thumbor@'),
+        require => Package['python-thumbor-wikimedia'],
     }
 
-    base::service_unit { 'thumbor-instances':
+    systemd::service { 'thumbor-instances':
         ensure  => present,
-        systemd => true,
+        content => systemd_template('thumbor-instances'),
     }
 
     logrotate::conf { 'thumbor':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I08ed0928adde65be47ff68c4619578dd5706ba37
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>

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