Merge "Support for Satellite Capsule in rhel-registration" into stable/pike

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

diff --git a/docker/services/collectd.yaml b/docker/services/collectd.yaml
index 3c0ba09..2ab020c 100644 (file)
--- a/docker/services/collectd.yaml
+++ b/docker/services/collectd.yaml
@@ -36,7 +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:
 
@@ -63,6 +66,8 @@ outputs:
           - get_attr: [CollectdBase, role_data, config_settings]
           - tripleo::profile::base::metrics::collectd::enable_file_logging: true
             collectd::plugin::logfile::log_file: /var/log/collectd/collectd.log
+      logging_source: {get_attr: [CollectdBase, role_data, logging_source]}
+      logging_groups: {get_attr: [CollectdBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [CollectdBase, role_data, step_config]
       service_config_settings: {get_attr: [CollectdBase, role_data, service_config_settings]}
@@ -111,3 +116,8 @@ outputs:
         - name: Stop and disable collectd service
           tags: step2
           service: name=collectd.service state=stopped enabled=no
+        - name: Remove collectd package if operator requests it
+          yum: name=collectd state=removed
+          tags: step2
+          ignore_errors: True
+          when: {get_param: UpgradeRemoveUnusedPackages}