openstack
/
puppet-ceilometer
Code Issues Proposed changes

Replace ceilometer-dbsync by ceilometer-upgrade 

https://review.openstack.org/#/c/388688/ has removed ceilometer-dbsync
and ceilometer-upgrade must be used instead.

Additionally, ceilometer-dbsync enabled option --skip-gnocchi-resource-types
and ceilometer-upgrade doesn't, so i'm setting it by default to
ensure backwards compatibility.

Closes-Bug: #1641076

Change-Id: I383fb7922e7984b067742e10a370b0d2f574dbe9
This commit is contained in:
Alfredo Moralejo 2016-11-11 06:28:35 -05:00
parent 7c34dbff35
commit af4af189ea
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/db.pp
View File

@ -41,7 +41,7 @@
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# #
# [*sync_db*] # [*sync_db*]
# (Optional) enable dbsync. # (Optional) enable database schema installation.
# Defaults to true. # Defaults to true.
# #
class ceilometer::db ( class ceilometer::db (

4
manifests/db/sync.pp
View File

@ -1,12 +1,12 @@
# == Class: ceilometer::db::sync # == Class: ceilometer::db::sync
# #
# Class to execute ceilometer dbsync # Class to execute ceilometer database schema creation
# #
# === Parameters: # === Parameters:
# #
# [*extra_params*] # [*extra_params*]
# (Optional) String of extra command line parameters # (Optional) String of extra command line parameters
# to append to the ceilometer-dbsync command. # to append to the ceilometer-upgrade command.
# Defaults to undef. # Defaults to undef.
# #
class ceilometer::db::sync( class ceilometer::db::sync(

2
manifests/params.pp
View File

@ -6,7 +6,7 @@
class ceilometer::params { class ceilometer::params {
include ::openstacklib::defaults include ::openstacklib::defaults
$dbsync_command = 'ceilometer-dbsync --config-file=/etc/ceilometer/ceilometer.conf' $dbsync_command = 'ceilometer-upgrade --config-file=/etc/ceilometer/ceilometer.conf --skip-gnocchi-resource-types'
$expirer_command = 'ceilometer-expirer' $expirer_command = 'ceilometer-expirer'
$user = 'ceilometer' $user = 'ceilometer'
$event_pipeline = '/etc/ceilometer/event_pipeline.yaml' $event_pipeline = '/etc/ceilometer/event_pipeline.yaml'

5
releasenotes/notes/replace-deprecated-ceilometer-dbsync-ddf62d90341731d7.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- In ocata cycle, ceilometer-dbsync has been removed
and ceilometer-upgrade must be used to create or
upgrade database schema and gnocchi resource types.

4
spec/classes/ceilometer_db_sync_spec.rb
View File

@ -6,7 +6,7 @@ describe 'ceilometer::db::sync' do
it 'runs ceilometer-dbsync' do it 'runs ceilometer-dbsync' do
is_expected.to contain_exec('ceilometer-dbsync').with( is_expected.to contain_exec('ceilometer-dbsync').with(
:command => 'ceilometer-dbsync --config-file=/etc/ceilometer/ceilometer.conf ', :command => 'ceilometer-upgrade --config-file=/etc/ceilometer/ceilometer.conf --skip-gnocchi-resource-types ',
:path => '/usr/bin', :path => '/usr/bin',
:refreshonly => 'true', :refreshonly => 'true',
:user => 'ceilometer', :user => 'ceilometer',
@ -22,7 +22,7 @@ describe 'ceilometer::db::sync' do
end end
it { is_expected.to contain_exec('ceilometer-dbsync').with( it { is_expected.to contain_exec('ceilometer-dbsync').with(
:command => 'ceilometer-dbsync --config-file=/etc/ceilometer/ceilometer.conf --config-file=/etc/ceilometer/ceilometer_01.conf', :command => 'ceilometer-upgrade --config-file=/etc/ceilometer/ceilometer.conf --skip-gnocchi-resource-types --config-file=/etc/ceilometer/ceilometer_01.conf',
:path => '/usr/bin', :path => '/usr/bin',
:user => 'ceilometer', :user => 'ceilometer',
:refreshonly => 'true', :refreshonly => 'true',