Merge "Deprecate Ceilometer Expirer"
This commit is contained in:
commit
b7b886ab24
|
@ -63,7 +63,6 @@ parameter_defaults:
|
|||
- OS::TripleO::Services::AodhEvaluator
|
||||
- OS::TripleO::Services::AodhNotifier
|
||||
- OS::TripleO::Services::AodhListener
|
||||
- OS::TripleO::Services::CeilometerExpirer
|
||||
- OS::TripleO::Services::CeilometerAgentCentral
|
||||
- OS::TripleO::Services::CeilometerAgentIpmi
|
||||
- OS::TripleO::Services::CeilometerAgentNotification
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
resource_registry:
|
||||
OS::TripleO::Services::CeilometerExpirer: ../../puppet/services/ceilometer-expirer.yaml
|
|
@ -189,7 +189,7 @@ resource_registry:
|
|||
OS::TripleO::Services::Timezone: puppet/services/time/timezone.yaml
|
||||
OS::TripleO::Services::CeilometerApi: puppet/services/ceilometer-api.yaml
|
||||
OS::TripleO::Services::CeilometerCollector: puppet/services/disabled/ceilometer-collector.yaml
|
||||
OS::TripleO::Services::CeilometerExpirer: puppet/services/ceilometer-expirer.yaml
|
||||
OS::TripleO::Services::CeilometerExpirer: puppet/services/disabled/ceilometer-expirer.yaml
|
||||
OS::TripleO::Services::CeilometerAgentCentral: puppet/services/ceilometer-agent-central.yaml
|
||||
OS::TripleO::Services::CeilometerAgentNotification: puppet/services/ceilometer-agent-notification.yaml
|
||||
OS::TripleO::Services::ComputeCeilometerAgent: puppet/services/ceilometer-agent-compute.yaml
|
||||
|
|
|
@ -2,6 +2,8 @@ heat_template_version: ocata
|
|||
|
||||
description: >
|
||||
OpenStack Ceilometer Expirer service configured with Puppet
|
||||
Note, This service is deprecated and will be removed in
|
||||
future releases.
|
||||
|
||||
parameters:
|
||||
ServiceNetMap:
|
||||
|
|
|
@ -0,0 +1,30 @@
|
|||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack Ceilometer Expirer 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
|
||||
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 Expirer role.
|
||||
value:
|
||||
service_name: ceilometer_expirer
|
||||
upgrade_tasks:
|
||||
- name: Stop and disable ceilometer_expirer service on upgrade
|
||||
tags: step1
|
||||
service: name=openstack-ceilometer-expirer state=stopped enabled=no
|
|
@ -0,0 +1,11 @@
|
|||
---
|
||||
upgrade:
|
||||
- With expirer deprecated and disabled by default, there is an upgrade
|
||||
impact here. If you had expirer enabled in ocata and you upgrade to
|
||||
pike the expirer will not be enabled anymore. If you wish to use
|
||||
expirer, ensure you include the ceilometer-expirer.yaml
|
||||
to your upgrade deploy command. Also note that with collector
|
||||
disabled, there is no need for expirer to be running.
|
||||
deprecations:
|
||||
- Deprecate and turn off expirer service as collector. Without collector
|
||||
and standard storage, expirer has no use.
|
|
@ -98,7 +98,6 @@
|
|||
- OS::TripleO::Services::Sshd
|
||||
- OS::TripleO::Services::Securetty
|
||||
- OS::TripleO::Services::Timezone
|
||||
- OS::TripleO::Services::CeilometerExpirer
|
||||
- OS::TripleO::Services::CeilometerAgentCentral
|
||||
- OS::TripleO::Services::CeilometerAgentNotification
|
||||
- OS::TripleO::Services::Horizon
|
||||
|
|
Loading…
Reference in New Issue