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

[apex-tripleo-heat-templates.git] / docker / services / ceilometer-agent-ipmi.yaml

diff --git a/docker/services/ceilometer-agent-ipmi.yaml b/docker/services/ceilometer-agent-ipmi.yaml
index 82d55be..9df93aa 100644 (file)
--- a/docker/services/ceilometer-agent-ipmi.yaml
+++ b/docker/services/ceilometer-agent-ipmi.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:
 
@@ -58,6 +62,8 @@ outputs:
     value:
       service_name: {get_attr: [CeilometerAgentIpmiBase, role_data, service_name]}
       config_settings: {get_attr: [CeilometerAgentIpmiBase, role_data, config_settings]}
+      logging_source: {get_attr: [CeilometerAgentIpmiBase, role_data, logging_source]}
+      logging_groups: {get_attr: [CeilometerAgentIpmiBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [CeilometerAgentIpmiBase, role_data, step_config]
       service_config_settings: {get_attr: [CeilometerAgentIpmiBase, role_data, service_config_settings]}
@@ -102,3 +108,8 @@ outputs:
         - name: Stop and disable ceilometer agent ipmi service
           tags: step2
           service: name=openstack-ceilometer-agent-ipmi state=stopped enabled=no
+        - name: Remove openstack-ceilometer-ipmi package if operator requests it
+          yum: name=openstack-ceilometer-ipmi state=removed
+          tags: step2
+          ignore_errors: True
+          when: {get_param: UpgradeRemoveUnusedPackages}