From bff4d7a11fc8954d74588c11caaa1b8f7957c341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gardais=20J=C3=A9r=C3=A9my?= Date: Tue, 27 Feb 2018 16:07:27 +0100 Subject: [PATCH] Allow to manage the RestartSec parameter of the unit --- CHANGELOG.md | 1 + defaults/main.yml | 3 ++- templates/etc/systemd/system/flexlm.service.j2 | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39f2d10..badb1d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Add a way to provide vendor daemon binaries and licence file. * Manage services for the lists var (flexlm__licences). * Allow to manage several licences on a same host (close #1). +* The **RestartSec** argument for the service can be set, cause some vendor daemon have a timewait greater than 60 seconds. ### Enhancements * Set a var to manage the state of the deployment by this role. diff --git a/defaults/main.yml b/defaults/main.yml index c602e04..dfbf2e7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -90,7 +90,8 @@ flexlm__service_unit_content: 'etc/systemd/system/flexlm.service.j2' # bin_src: '{{ inventory_dir + "/../resources/service/matlab-lm/bin/" }}' # lic_path: '/opt/matlab/etc/licence.lic' # lic_src: '{{ inventory_dir + "/../resources/hosts/matlab-lm/opt/matlab/etc/licence.lic" }}' -# #service: False +# service: True +# timewait: 60 # ports: [ '27000', '33188' ] # not used right now flexlm__licences: [] diff --git a/templates/etc/systemd/system/flexlm.service.j2 b/templates/etc/systemd/system/flexlm.service.j2 index e548b4c..ceeec1c 100644 --- a/templates/etc/systemd/system/flexlm.service.j2 +++ b/templates/etc/systemd/system/flexlm.service.j2 @@ -10,7 +10,7 @@ WorkingDirectory={{ item.bin_path | d("/opt/" + item.name + "/bin") }} ExecStart={{ flexlm__lmgrd_path }} -z -c {{ item.lic_path | d("/opt/" + item.name + "/etc/licence.lic") }} SuccessExitStatus=15 Restart=always -RestartSec=30 +RestartSec={{ item.timewait | d(60) | int }} [Install] WantedBy=multi-user.target