diff options
| author | Dimitrios Apostolou <dimitrios.apostolou@qt.io> | 2019-07-04 17:03:16 +0200 |
|---|---|---|
| committer | Dimitrios Apostolou <dimitrios.apostolou@qt.io> | 2019-07-05 08:24:00 +0000 |
| commit | 0ac440755184ab6f43b4629baf1412ae06373391 (patch) | |
| tree | 76324357d5201a448d5cfe2d2fba66e1bec6ca43 | |
| parent | 03a6a7d7a43990bcb2745d8dd20b1382457aa16b (diff) | |
Do not run the "service status" command
Puppet was failing to run that command, because it is not implemented
for the initscripts of "squid", "danted" and "frox", and was filling up
the logs with errors.
Fixes: QTQAINFRA-3079
Change-Id: Idc988f53616683b0dd52ed4c20e2a1421aed2fbd
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
3 files changed, 5 insertions, 0 deletions
diff --git a/puppet/modules/network_test_server/manifests/linux/danted.pp b/puppet/modules/network_test_server/manifests/linux/danted.pp index 89e081c..b9aa037 100644 --- a/puppet/modules/network_test_server/manifests/linux/danted.pp +++ b/puppet/modules/network_test_server/manifests/linux/danted.pp @@ -36,11 +36,13 @@ class network_test_server::linux::danted { "danted": enable => true, ensure => running, + hasstatus=> false, require => Package["dante-server"], ; "danted-authenticating": enable => true, ensure => running, + hasstatus=> false, require => Package["dante-server"], ; } diff --git a/puppet/modules/network_test_server/manifests/linux/frox.pp b/puppet/modules/network_test_server/manifests/linux/frox.pp index c29257b..12564a9 100644 --- a/puppet/modules/network_test_server/manifests/linux/frox.pp +++ b/puppet/modules/network_test_server/manifests/linux/frox.pp @@ -8,6 +8,7 @@ class network_test_server::linux::frox { "frox": enable => true, ensure => running, + hasstatus=> false, require => [ Package["frox"], File["/etc/default/frox", "/etc/frox.conf" ] ], ; } diff --git a/puppet/modules/network_test_server/manifests/linux/squid.pp b/puppet/modules/network_test_server/manifests/linux/squid.pp index 384ddcc..9063ef1 100644 --- a/puppet/modules/network_test_server/manifests/linux/squid.pp +++ b/puppet/modules/network_test_server/manifests/linux/squid.pp @@ -18,12 +18,14 @@ class network_test_server::linux::squid { "squid3": enable => true, ensure => running, + hasstatus=> false, require => [ Package["squid3"], File["/etc/default/squid3", "/etc/squid3/squid.conf"] ], pattern => '-f /etc/squid3/squid.conf', ; "squid3-authenticating-ntlm": enable => true, ensure => running, + hasstatus=> false, require => [ Package["squid3"], File["/etc/default/squid3", "/etc/squid3/squid-authenticating-ntlm.conf"] ], pattern => '-f /etc/squid3/squid-authenticating-ntlm.conf', ; |