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

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

diff --git a/docker/services/ceilometer-agent-compute.yaml b/docker/services/ceilometer-agent-compute.yaml
index 09677c6..1ee9f49 100644 (file)
--- a/docker/services/ceilometer-agent-compute.yaml
+++ b/docker/services/ceilometer-agent-compute.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: [CeilometerAgentComputeBase, role_data, service_name]}
       config_settings: {get_attr: [CeilometerAgentComputeBase, role_data, config_settings]}
+      logging_source: {get_attr: [CeilometerAgentComputeBase, role_data, logging_source]}
+      logging_groups: {get_attr: [CeilometerAgentComputeBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [CeilometerAgentComputeBase, role_data, step_config]
       service_config_settings: {get_attr: [CeilometerAgentComputeBase, role_data, service_config_settings]}
@@ -69,7 +75,7 @@ outputs:
         config_image: {get_param: DockerCeilometerConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ceilometer_agent_compute.json:
-          command: /usr/bin/ceilometer-polling --polling-namespaces compute
+          command: /usr/bin/ceilometer-polling --polling-namespaces compute --logfile /var/log/ceilometer/compute.log
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
@@ -89,9 +95,40 @@ outputs:
                   - /var/lib/kolla/config_files/ceilometer_agent_compute.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/ceilometer/:/var/lib/kolla/config_files/src:ro
                   - /var/run/libvirt:/var/run/libvirt:ro
+                  - /var/log/containers/ceilometer:/var/log/ceilometer
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      host_prep_tasks:
+        - name: create persistent logs directory
+          file:
+            path: /var/log/containers/ceilometer
+            state: directory
       upgrade_tasks:
-        - name: Stop and disable ceilometer-agent-compute service
+        - name: Check if openstack-ceilometer-compute is deployed
+          command: systemctl is-enabled openstack-ceilometer-compute
+          tags: step2
+          ignore_errors: True
+          register: openstack_ceilometer_compute_enabled
+        - name: Check if openstack-ceilometer-polling is deployed
+          command: systemctl is-enabled openstack-ceilometer-polling
+          tags: step2
+          ignore_errors: True
+          register: openstack_ceilometer_polling_enabled
+        - name: Stop and disable ceilometer compute agent
           tags: step2
           service: name=openstack-ceilometer-compute state=stopped enabled=no
+          when: openstack_ceilometer_compute_enabled.rc|default('') == 0
+        - name: Stop and disable ceilometer polling agent
+          tags: step2
+          service: name=openstack-ceilometer-polling state=stopped enabled=no
+          when: openstack_ceilometer_polling_enabled.rc|default('') == 0
+        - name: Remove openstack-ceilometer-compute package if operator requests it
+          yum: name=openstack-ceilometer-compute state=removed
+          tags: step2
+          ignore_errors: True
+          when: {get_param: UpgradeRemoveUnusedPackages}
+        - name: Remove openstack-ceilometer-polling package if operator requests it
+          yum: name=openstack-ceilometer-polling state=removed
+          tags: step2
+          ignore_errors: True
+          when: {get_param: UpgradeRemoveUnusedPackages}