From 794780091ac10fc820d984b3e61cc5c835b5f80c Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 20 Jan 2017 08:47:59 -0800 Subject: [PATCH] Remove now unneeded systemd sysv compat hack With the upgrade to the wildfly puppet module we should no longer need this hack to get systemd sysv compat working. Remove it as it is now dead code and conflicts with the wildfly update. Change-Id: I39453506821ff7073290a4e5696eda8575b6cb06 --- manifests/wildfly.pp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/manifests/wildfly.pp b/manifests/wildfly.pp index 49b7246..89896a9 100644 --- a/manifests/wildfly.pp +++ b/manifests/wildfly.pp @@ -25,17 +25,6 @@ class zanata::wildfly( ensure => present, } - if ($::operatingsystem == 'Ubuntu') and ($::operatingsystemrelease >= '16.04') { - # This is a hack to make sure that systemd is aware of the new service - # before we attempt to start it. - exec { 'wildfly-systemd-daemon-reload': - command => '/bin/systemctl daemon-reload', - before => Service['wildfly'], - subscribe => File['/etc/init.d/wildfly'], - refreshonly => true, - } - } - class { '::wildfly': version => $wildfly_version, install_source => $wildfly_install_source,