Remove ceilometer apache files on upgrade

Ceilometer API runs under apache. Since this service is
deprecated and disabled in pike, we need to ensure the
apache files are removed during upgrade.

Change-Id: I0c0913e74396bd463f5a6da46f83512bab77b75e
This commit is contained in:
Pradeep Kilambi 2017-05-24 13:52:21 -04:00
parent 25caba5ce8
commit 6d82c28036
2 changed files with 42 additions and 1 deletions

View File

@ -192,7 +192,7 @@ resource_registry:
OS::TripleO::Services::Snmp: puppet/services/snmp.yaml
OS::TripleO::Services::Tacker: OS::Heat::None
OS::TripleO::Services::Timezone: puppet/services/time/timezone.yaml
OS::TripleO::Services::CeilometerApi: puppet/services/ceilometer-api.yaml
OS::TripleO::Services::CeilometerApi: puppet/services/disabled/ceilometer-api-disabled.yaml
OS::TripleO::Services::CeilometerCollector: puppet/services/disabled/ceilometer-collector-disabled.yaml
OS::TripleO::Services::CeilometerExpirer: puppet/services/disabled/ceilometer-expirer-disabled.yaml
OS::TripleO::Services::CeilometerAgentCentral: puppet/services/ceilometer-agent-central.yaml

View File

@ -0,0 +1,41 @@
heat_template_version: pike
description: >
OpenStack Ceilometer API service, disabled since pike
parameters:
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
DefaultPasswords:
default: {}
type: json
RoleName:
default: ''
description: Role name on which the service is applied
type: string
RoleParameters:
default: {}
description: Parameters specific to the role
type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
outputs:
role_data:
description: Role data for the disabled Ceilometer API role.
value:
service_name: ceilometer_api_disabled
upgrade_tasks:
- name: Purge Ceilometer apache config files
tags: step1
file: path=/etc/httpd/conf.d/10-ceilometer_wsgi.conf state=absent
- name: Clean up ceilometer port from ports.conf
tags: step1
lineinfile: dest=/etc/httpd/conf/ports.conf state=absent regexp="8777$"