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

Change subject: varnish: convert to systemd::service
......................................................................

varnish: convert to systemd::service

Bug: T173078
Change-Id: Idd5c6a6c589064f7b451528e8b061b1a7b5309d5
---
M modules/strongswan/manifests/init.pp
M modules/varnish/manifests/instance.pp
M modules/varnish/manifests/logging/media.pp
M modules/varnish/manifests/logging/reqstats.pp
M modules/varnish/manifests/logging/rls.pp
M modules/varnish/manifests/logging/statsd.pp
M modules/varnish/manifests/logging/xcache.pp
M modules/varnish/manifests/logging/xcps.pp
8 files changed, 21 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/371617/1

diff --git a/modules/strongswan/manifests/init.pp 
b/modules/strongswan/manifests/init.pp
index 81ba81b9..6eef5f7 100644
--- a/modules/strongswan/manifests/init.pp
+++ b/modules/strongswan/manifests/init.pp
@@ -90,8 +90,9 @@
         source => 'puppet:///modules/strongswan/ipsec-global',
     }
 
-    base::service_unit { 'strongswan':
-        systemd => true,
-        require => Package['strongswan']
+    systemd::service { 'strongswan':
+        content => systemd_template('strongswan'),
+        restart => true,
+        require => Package['strongswan'],
     }
 }
diff --git a/modules/varnish/manifests/instance.pp 
b/modules/varnish/manifests/instance.pp
index a6324c2..c9ff2a7 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -115,10 +115,8 @@
         content => template("${module_name}/varnish-default.erb"),
     }
 
-    base::service_unit { "varnish${instancesuffix}":
-        template_name  => 'varnish',
-        systemd        => true,
-        refresh        => false,
+    systemd::service { "varnish${instancesuffix}":
+        content        => systemd_template('varnish'),
         service_params => {
             tag     => 'varnish_instance',
             enable  => true,
diff --git a/modules/varnish/manifests/logging/media.pp 
b/modules/varnish/manifests/logging/media.pp
index 4a25e0b..a86e001 100644
--- a/modules/varnish/manifests/logging/media.pp
+++ b/modules/varnish/manifests/logging/media.pp
@@ -27,11 +27,9 @@
         notify  => Service['varnishmedia'],
     }
 
-    base::service_unit { 'varnishmedia':
+    systemd::service { 'varnishmedia':
         ensure         => present,
-        systemd        => true,
-        strict         => false,
-        template_name  => 'varnishmedia',
+        content        => systemd_template('varnishmedia'),
         require        => File['/usr/local/bin/varnishmedia'],
         subscribe      => 
File['/usr/local/lib/python2.7/dist-packages/cachestats.py'],
         service_params => {
diff --git a/modules/varnish/manifests/logging/reqstats.pp 
b/modules/varnish/manifests/logging/reqstats.pp
index 0e3fad4..6f9df31 100644
--- a/modules/varnish/manifests/logging/reqstats.pp
+++ b/modules/varnish/manifests/logging/reqstats.pp
@@ -45,11 +45,10 @@
         }
     }
 
-    base::service_unit { $service_unit_name:
+    systemd::service { $service_unit_name:
         ensure         => $ensure,
-        systemd        => true,
-        strict         => false,
-        template_name  => 'varnishreqstats',
+        content        => systemd_template('varnishreqstats'),
+        restart        => true,
         require        => File['/usr/local/bin/varnishreqstats'],
         subscribe      => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
         service_params => {
diff --git a/modules/varnish/manifests/logging/rls.pp 
b/modules/varnish/manifests/logging/rls.pp
index 238066a..9ee16e7 100644
--- a/modules/varnish/manifests/logging/rls.pp
+++ b/modules/varnish/manifests/logging/rls.pp
@@ -27,11 +27,10 @@
         notify  => Service['varnishrls'],
     }
 
-    base::service_unit { 'varnishrls':
+    systemd::service { 'varnishrls':
         ensure         => present,
-        systemd        => true,
-        strict         => false,
-        template_name  => 'varnishrls',
+        content        => systemd_template('varnishrls'),
+        restart        => true,
         require        => File['/usr/local/bin/varnishrls'],
         subscribe      => 
File['/usr/local/lib/python2.7/dist-packages/cachestats.py'],
         service_params => {
diff --git a/modules/varnish/manifests/logging/statsd.pp 
b/modules/varnish/manifests/logging/statsd.pp
index a053876..74e9230 100644
--- a/modules/varnish/manifests/logging/statsd.pp
+++ b/modules/varnish/manifests/logging/statsd.pp
@@ -47,11 +47,9 @@
         }
     }
 
-    base::service_unit { $service_unit_name:
+    systemd::service { $service_unit_name:
         ensure         => present,
-        systemd        => true,
-        strict         => false,
-        template_name  => 'varnishstatsd',
+        content        => systemd_template('varnishstatsd'),
         require        => File['/usr/local/bin/varnishstatsd'],
         subscribe      => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
         service_params => {
diff --git a/modules/varnish/manifests/logging/xcache.pp 
b/modules/varnish/manifests/logging/xcache.pp
index 0e5b277..7d84cec 100644
--- a/modules/varnish/manifests/logging/xcache.pp
+++ b/modules/varnish/manifests/logging/xcache.pp
@@ -35,11 +35,9 @@
         notify  => Service['varnishxcache'],
     }
 
-    base::service_unit { 'varnishxcache':
+    systemd::service { 'varnishxcache':
         ensure         => present,
-        systemd        => true,
-        strict         => false,
-        template_name  => 'varnishxcache',
+        content        => systemd_template('varnishxcache'),
         require        => File['/usr/local/bin/varnishxcache'],
         subscribe      => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
         service_params => {
diff --git a/modules/varnish/manifests/logging/xcps.pp 
b/modules/varnish/manifests/logging/xcps.pp
index 19304d7..51b136e 100644
--- a/modules/varnish/manifests/logging/xcps.pp
+++ b/modules/varnish/manifests/logging/xcps.pp
@@ -27,11 +27,10 @@
         notify  => Service['varnishxcps'],
     }
 
-    base::service_unit { 'varnishxcps':
+    systemd::service { 'varnishxcps':
         ensure         => present,
-        systemd        => true,
-        strict         => false,
-        template_name  => 'varnishxcps',
+        content        => systemd_template('varnishxcps'),
+        restart        => true,
         require        => File['/usr/local/bin/varnishxcps'],
         subscribe      => 
File['/usr/local/lib/python2.7/dist-packages/cachestats.py'],
         service_params => {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd5c6a6c589064f7b451528e8b061b1a7b5309d5
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

Reply via email to