diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp index 246a57b88..77dfa5fce 100644 --- a/elements/puppet-stack-config/puppet-stack-config.pp +++ b/elements/puppet-stack-config/puppet-stack-config.pp @@ -185,7 +185,6 @@ if str2bool(hiera('enable_telemetry', false)) { include ::ceilometer include ::ceilometer::agent::notification include ::ceilometer::agent::central - include ::ceilometer::expirer include ::ceilometer::agent::auth include ::ceilometer::dispatcher::gnocchi @@ -214,9 +213,6 @@ if str2bool(hiera('enable_telemetry', false)) { -> Openstacklib::Service_validation['gnocchi-status'] -> Exec['ceilo-gnocchi-upgrade'] - Cron <| title == 'ceilometer-expirer' |> { command => - "sleep $((\$(od -A n -t d -N 3 /dev/urandom) \\% 86400)) && ${::ceilometer::params::expirer_command}" } - # Aodh $aodh_dsn = match(hiera('aodh::db::database_connection'), $re_dsn) class { '::aodh::db::mysql': diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template index 0b5600406..fcb3b03c1 100644 --- a/elements/puppet-stack-config/puppet-stack-config.yaml.template +++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template @@ -279,7 +279,6 @@ neutron::service_plugins: ['segments'] # Ceilometer ceilometer::debug: "%{hiera('debug')}" -ceilometer::expirer::time_to_live: undef ceilometer::metering_secret: {{UNDERCLOUD_CEILOMETER_METERING_SECRET}} ceilometer::rabbit_userid: {{UNDERCLOUD_RABBIT_USERNAME}} ceilometer::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}