From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 1 Mar 2017 05:57:48 +0000 (+0000)
Subject: Merge "Add auditd upgrate steps" into stable/ocata
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7d386877fac3aa62167cf5e96940c6c24105d984;hp=28cc7e6e31a0870716aff4ab706a1cef997264ff;p=apex-tripleo-heat-templates.git

Merge "Add auditd upgrate steps" into stable/ocata
---

diff --git a/puppet/services/auditd.yaml b/puppet/services/auditd.yaml
index 639631e1..a0535ae7 100644
--- a/puppet/services/auditd.yaml
+++ b/puppet/services/auditd.yaml
@@ -32,3 +32,18 @@ outputs:
         auditd::rules: {get_param: AuditdRules}
       step_config: |
         include ::tripleo::profile::base::auditd
+      upgrade_tasks:
+        - name: Check if auditd is deployed
+          command: systemctl is-enabled auditd
+          tags: step0,validation
+          ignore_errors: True
+          register: auditd_enabled
+        - name: "PreUpgrade step0,validation: Check if auditd is running"
+          shell: >
+            /usr/bin/systemctl show 'auditd' --property ActiveState |
+            grep '\bactive\b'
+          when: auditd_enabled.rc == 0
+          tags: step0,validation
+        - name: Stop auditd service
+          tags: step2
+          service: name=auditd state=stopped