diff options
author | Pradeep Kilambi <pkilambi@redhat.com> | 2017-05-10 13:09:12 -0400 |
---|---|---|
committer | Pradeep Kilambi <pkilambi@redhat.com> | 2017-05-11 11:44:48 -0400 |
commit | 66b39c2c21b6629222c0d212642156437119e977 (patch) | |
tree | b8d66f436c350205c97c357132f2918ebff6e62a | |
parent | bb7a45226e5a6bb3574e8dbc7a5dd8183dd17703 (diff) |
Deprecate Ceilometer Expirer
We dont need expirer unless we have collector and standard
storage enabled. Lets turn it off by default and make it
an optional service. In upgrade scenario, we will kill the
process and stop the expirer, unless explicitly enabled.
Change-Id: Icffb7d1bb2cf7bd61026be7d2dcfbd70cd3bcbda
-rw-r--r-- | ci/environments/scenario001-multinode.yaml | 1 | ||||
-rw-r--r-- | environments/services/ceilometer-expirer.yaml | 2 | ||||
-rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 2 | ||||
-rw-r--r-- | puppet/services/ceilometer-expirer.yaml | 2 | ||||
-rw-r--r-- | puppet/services/disabled/ceilometer-expirer.yaml | 30 | ||||
-rw-r--r-- | releasenotes/notes/deprecate-ceilometer-expirer-83b193a07631d89d.yaml | 11 | ||||
-rw-r--r-- | roles_data.yaml | 1 |
7 files changed, 46 insertions, 3 deletions
diff --git a/ci/environments/scenario001-multinode.yaml b/ci/environments/scenario001-multinode.yaml index eee6f1ce..a5c85aa6 100644 --- a/ci/environments/scenario001-multinode.yaml +++ b/ci/environments/scenario001-multinode.yaml @@ -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 diff --git a/environments/services/ceilometer-expirer.yaml b/environments/services/ceilometer-expirer.yaml new file mode 100644 index 00000000..d20ee255 --- /dev/null +++ b/environments/services/ceilometer-expirer.yaml @@ -0,0 +1,2 @@ +resource_registry: + OS::TripleO::Services::CeilometerExpirer: ../../puppet/services/ceilometer-expirer.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 0d55070c..74776e7a 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.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 diff --git a/puppet/services/ceilometer-expirer.yaml b/puppet/services/ceilometer-expirer.yaml index 714434b1..eb22f33e 100644 --- a/puppet/services/ceilometer-expirer.yaml +++ b/puppet/services/ceilometer-expirer.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: diff --git a/puppet/services/disabled/ceilometer-expirer.yaml b/puppet/services/disabled/ceilometer-expirer.yaml new file mode 100644 index 00000000..ec018e4f --- /dev/null +++ b/puppet/services/disabled/ceilometer-expirer.yaml @@ -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 diff --git a/releasenotes/notes/deprecate-ceilometer-expirer-83b193a07631d89d.yaml b/releasenotes/notes/deprecate-ceilometer-expirer-83b193a07631d89d.yaml new file mode 100644 index 00000000..9088f963 --- /dev/null +++ b/releasenotes/notes/deprecate-ceilometer-expirer-83b193a07631d89d.yaml @@ -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. diff --git a/roles_data.yaml b/roles_data.yaml index 67c763ce..e0867cbc 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -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 |