openstack
/
cookbook-openstack-telemetry
Code Issues Proposed changes

Replace ceilometer-dbsync by ceilometer-upgrade 

ceilometer-dbsync is removed in pike release
see : https://docs.openstack.org/releasenotes/ceilometer/en_GB/ocata.html

Change-Id: I2d2407e4b0deb38e8fa410c9e96e2d16e69964e3
Closes-Bug: #1727329
This commit is contained in:
Seb-Solon 2017-10-25 21:04:50 -04:00
parent d6736f20ac
commit 2e812eb316
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -74,7 +74,7 @@ Recipes
- Install the client packages - Install the client packages
## collector ## collector
- Installs collector package and service. If the NoSQL database is used for metering service, ceilometer-dbsync will not be executed. - Installs collector package and service. If the NoSQL database is used for metering service, ceilometer-upgrade will not be executed.
## common ## common
- Common metering configuration. - Common metering configuration.

2
metadata.rb
View File

@ -11,7 +11,7 @@ recipe 'openstack-telemetry::agent-compute', 'Installs agent compute service.'
recipe 'openstack-telemetry::agent-notification', 'Installs the agent notification service.' recipe 'openstack-telemetry::agent-notification', 'Installs the agent notification service.'
recipe 'openstack-telemetry::api', 'Installs API service.' recipe 'openstack-telemetry::api', 'Installs API service.'
recipe 'openstack-telemetry::client', 'Installs client.' recipe 'openstack-telemetry::client', 'Installs client.'
recipe 'openstack-telemetry::collector', 'Installs collector service. If the NoSQL database is used for metering service, ceilometer-dbsync will not be executed.' recipe 'openstack-telemetry::collector', 'Installs collector service. If the NoSQL database is used for metering service, ceilometer-upgrade will not be executed.'
recipe 'openstack-telemetry::alarm-evaluator', 'Installs the alarm evaluator service.' recipe 'openstack-telemetry::alarm-evaluator', 'Installs the alarm evaluator service.'
recipe 'openstack-telemetry::alarm-notifier', 'Installs the alarm notifier service.' recipe 'openstack-telemetry::alarm-notifier', 'Installs the alarm notifier service.'
recipe 'openstack-telemetry::common', 'Common metering configuration.' recipe 'openstack-telemetry::common', 'Common metering configuration.'

2
recipes/collector.rb
View File

@ -32,7 +32,7 @@ end
conf_switch = "--config-file #{node['openstack']['telemetry']['conf_file']}" conf_switch = "--config-file #{node['openstack']['telemetry']['conf_file']}"
execute 'database migration' do execute 'database migration' do
command "ceilometer-dbsync #{conf_switch}" command "ceilometer-upgrade --skip-gnocchi-resource-types #{conf_switch}"
end end
service 'ceilometer-collector' do service 'ceilometer-collector' do

2
spec/collector_spec.rb
View File

@ -17,7 +17,7 @@ describe 'openstack-telemetry::collector' do
it do it do
expect(chef_run).to run_execute( expect(chef_run).to run_execute(
'ceilometer-dbsync --config-file /etc/ceilometer/ceilometer.conf' 'ceilometer-upgrade --skip-gnocchi-resource-types --config-file /etc/ceilometer/ceilometer.conf'
) )
end end