aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/logging
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-02-27 13:04:08 -0500
committerEmilien Macchi <emilien@redhat.com>2017-03-01 19:49:00 +0000
commit7c84a9b390c469e716e5802eef078d2df3902c6a (patch)
tree329861c5c0f3a8e1b04f12c7cdb7d7b7fe37ce72 /puppet/services/logging
parentb889a4b5b3be37ee1dabb60ddce519af84b15b22 (diff)
upgrades/validation: only run validation when services exist
During upgrades, validation test if a service is running before the upgrade process starts. In some cases, servies doesn't exist yet so we don't want to run the validation. This patch makes sure we check if the service is actually present on the system before validating it's running correctly. Also it makes sure that services are enabled before trying to stop them. It allows use-cases where we want to add new services during an upgrade. Also install new packages of services added in Ocata, so we can validate upgrades on scenarios jobs. Change-Id: Ib48fb6b1557be43956557cbde4cbe26b53a50bd8
Diffstat (limited to 'puppet/services/logging')
-rw-r--r--puppet/services/logging/fluentd-client.yaml11
1 files changed, 11 insertions, 0 deletions
diff --git a/puppet/services/logging/fluentd-client.yaml b/puppet/services/logging/fluentd-client.yaml
index 490ccbee..57595b82 100644
--- a/puppet/services/logging/fluentd-client.yaml
+++ b/puppet/services/logging/fluentd-client.yaml
@@ -63,11 +63,22 @@ outputs:
step_config: |
include ::tripleo::profile::base::logging::fluentd
upgrade_tasks:
+ - name: Check if fluentd_client is deployed
+ command: systemctl is-enabled fluentd
+ tags: common
+ ignore_errors: True
+ register: fluentd_client_enabled
- name: Check status of fluentd service
shell: >
/usr/bin/systemctl show fluentd --property ActiveState |
grep '\bactive\b'
+ when: fluentd_client_enabled.rc == 0
tags: step0,validation
- name: Stop fluentd service
tags: step1
+ when: fluentd_client_enabled.rc == 0
service: name=fluentd state=stopped
+ - name: Install fluentd package if it was disabled
+ tags: step3
+ yum: name=fluentd state=latest
+ when: fluentd_client_enabled.rc != 0