Merge "Fix wrong permission on database during mysql_init tasks." into stable/pike

[apex-tripleo-heat-templates.git] / docker / services / sahara-engine.yaml

diff --git a/docker/services/sahara-engine.yaml b/docker/services/sahara-engine.yaml
index b166029..0a061bd 100644 (file)
--- a/docker/services/sahara-engine.yaml
+++ b/docker/services/sahara-engine.yaml
@@ -36,6 +36,10 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  UpgradeRemoveUnusedPackages:
+    default: false
+    description: Remove package if the service is being disabled during upgrade
+    type: boolean
 
 resources:
 
@@ -62,6 +66,8 @@ outputs:
         map_merge:
           - get_attr: [SaharaEnginePuppetBase, role_data, config_settings]
           - sahara::sync_db: false
+      logging_source: {get_attr: [SaharaEnginePuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [SaharaEnginePuppetBase, role_data, logging_groups]}
       step_config: &step_config
         list_join:
           - "\n"
@@ -119,3 +125,8 @@ outputs:
         - name: Stop and disable sahara_engine service
           tags: step2
           service: name=openstack-sahara-engine state=stopped enabled=no
+        - name: Remove openstack-sahara-engine package if operator requests it
+          yum: name=openstack-sahara-engine state=removed
+          tags: step2
+          ignore_errors: True
+          when: {get_param: UpgradeRemoveUnusedPackages}