Merge "Only mount selinux sysfs in nova_libvirt container" into stable/pike

[apex-tripleo-heat-templates.git] / docker / services / aodh-evaluator.yaml

diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml
index f75c57b..fda6faa 100644 (file)
--- a/docker/services/aodh-evaluator.yaml
+++ b/docker/services/aodh-evaluator.yaml
@@ -36,12 +36,19 @@ 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:
 
   ContainersCommon:
     type: ./containers-common.yaml
 
+  MySQLClient:
+    type: ../../puppet/services/database/mysql-client.yaml
+
   AodhEvaluatorBase:
     type: ../../puppet/services/aodh-evaluator.yaml
     properties:
@@ -60,8 +67,13 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [AodhEvaluatorBase, role_data, config_settings]
+      logging_source: {get_attr: [AodhEvaluatorBase, role_data, logging_source]}
+      logging_groups: {get_attr: [AodhEvaluatorBase, role_data, logging_groups]}
       step_config: &step_config
-        get_attr: [AodhEvaluatorBase, role_data, step_config]
+        list_join:
+          - "\n"
+          - - {get_attr: [AodhEvaluatorBase, role_data, step_config]}
+            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [AodhEvaluatorBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
@@ -106,3 +118,8 @@ outputs:
         - name: Stop and disable openstack-aodh-evaluator service
           tags: step2
           service: name=openstack-aodh-evaluator.service state=stopped enabled=no
+        - name: Remove openstack-aodh-evaluator package if operator requests it
+          yum: name=openstack-aodh-evaluator state=removed
+          tags: step2
+          ignore_errors: True
+          when: {get_param: UpgradeRemoveUnusedPackages}