From: Martin Mágr <mmagr@redhat.com>
Date: Thu, 9 Feb 2017 13:12:41 +0000 (+0100)
Subject: Add upgrade tasks for opstools services
X-Git-Tag: opnfv-6.0.0~1079^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=35c64e185099d375d698c38008f8a6f1063b1301;p=apex-tripleo-heat-templates.git

Add upgrade tasks for opstools services

This patch adds upgrade tasks for sensu-client, fluentd and collectd

Change-Id: I3a8096159664b1934b34f6c79b8afb4a3dc645c8
---

diff --git a/puppet/services/logging/fluentd-client.yaml b/puppet/services/logging/fluentd-client.yaml
index 769ab68f..94c63d33 100644
--- a/puppet/services/logging/fluentd-client.yaml
+++ b/puppet/services/logging/fluentd-client.yaml
@@ -62,3 +62,12 @@ outputs:
               get_attr: [LoggingConfiguration, LoggingSharedKey]
       step_config: |
         include ::tripleo::profile::base::logging::fluentd
+      upgrade_tasks:
+        - name: Check status of fluentd service
+          shell: >
+            /usr/bin/systemctl show fluentd --property ActiveState |
+            grep '\bactive\b'
+          tags: step0,validation
+        - name: Stop fluentd service
+          tags: step2
+          service: name=fluentd state=stopped
diff --git a/puppet/services/metrics/collectd.yaml b/puppet/services/metrics/collectd.yaml
index e4e7dac7..a3e3b842 100644
--- a/puppet/services/metrics/collectd.yaml
+++ b/puppet/services/metrics/collectd.yaml
@@ -109,3 +109,12 @@ outputs:
               .flatten().distinct()
       step_config: |
         include ::tripleo::profile::base::metrics::collectd
+      upgrade_tasks:
+        - name: Check status of collectd service
+          shell: >
+            /usr/bin/systemctl show collectd --property ActiveState |
+            grep '\bactive\b'
+          tags: step0,validation
+        - name: Stop collectd service
+          tags: step2
+          service: name=collectd state=stopped
diff --git a/puppet/services/monitoring/sensu-client.yaml b/puppet/services/monitoring/sensu-client.yaml
index 76ba59c1..d74a68a2 100644
--- a/puppet/services/monitoring/sensu-client.yaml
+++ b/puppet/services/monitoring/sensu-client.yaml
@@ -62,3 +62,12 @@ outputs:
                     region: {get_param: KeystoneRegion}
       step_config: |
         include ::tripleo::profile::base::monitoring::sensu
+      upgrade_tasks:
+        - name: Check status of sensu-client service
+          shell: >
+            /usr/bin/systemctl show sensu-client --property ActiveState |
+            grep '\bactive\b'
+          tags: step0,validation
+        - name: Stop sensu-client service
+          tags: step2
+          service: name=sensu-client state=stopped