summaryrefslogtreecommitdiffstats
path: root/puppet/services/metrics
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/metrics
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/metrics')
-rw-r--r--puppet/services/metrics/collectd.yaml11
1 files changed, 11 insertions, 0 deletions
diff --git a/puppet/services/metrics/collectd.yaml b/puppet/services/metrics/collectd.yaml
index da596656..49b2d4c2 100644
--- a/puppet/services/metrics/collectd.yaml
+++ b/puppet/services/metrics/collectd.yaml
@@ -110,11 +110,22 @@ outputs:
step_config: |
include ::tripleo::profile::base::metrics::collectd
upgrade_tasks:
+ - name: Check if collectd is deployed
+ command: systemctl is-enabled collectd
+ tags: common
+ ignore_errors: True
+ register: collectd_enabled
- name: Check status of collectd service
shell: >
/usr/bin/systemctl show collectd --property ActiveState |
grep '\bactive\b'
+ when: collectd_enabled.rc == 0
tags: step0,validation
- name: Stop collectd service
tags: step1
+ when: collectd_enabled.rc == 0
service: name=collectd state=stopped
+ - name: Install collectd package if it was disabled
+ tags: step3
+ yum: name=collectd state=latest
+ when: collectd_enabled.rc != 0