Change flat network name for nosdn fdio scenario

[apex-tripleo-heat-templates.git] / puppet / services / auditd.yaml

diff --git a/puppet/services/auditd.yaml b/puppet/services/auditd.yaml
index a0535ae..3a676dd 100644 (file)
--- a/puppet/services/auditd.yaml
+++ b/puppet/services/auditd.yaml
@@ -1,9 +1,13 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   AuditD configured with Puppet
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -13,6 +17,14 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -35,7 +47,7 @@ outputs:
       upgrade_tasks:
         - name: Check if auditd is deployed
           command: systemctl is-enabled auditd
-          tags: step0,validation
+          tags: common
           ignore_errors: True
           register: auditd_enabled
         - name: "PreUpgrade step0,validation: Check if auditd is running"
@@ -46,4 +58,5 @@ outputs:
           tags: step0,validation
         - name: Stop auditd service
           tags: step2
+          when: auditd_enabled.rc == 0
           service: name=auditd state=stopped