diff --git a/manifests/db.pp b/manifests/db.pp index 226e32e0..ed489aaa 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -41,7 +41,7 @@ # Defaults to $::os_service_default. # # [*sync_db*] -# (Optional) enable dbsync. +# (Optional) enable database schema installation. # Defaults to true. # class ceilometer::db ( diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index 3a747af5..af5b8bc2 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -1,12 +1,12 @@ # == Class: ceilometer::db::sync # -# Class to execute ceilometer dbsync +# Class to execute ceilometer database schema creation # # === Parameters: # # [*extra_params*] # (Optional) String of extra command line parameters -# to append to the ceilometer-dbsync command. +# to append to the ceilometer-upgrade command. # Defaults to undef. # class ceilometer::db::sync( diff --git a/manifests/params.pp b/manifests/params.pp index 386e31a8..a67c44d0 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -6,7 +6,7 @@ class ceilometer::params { 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' $user = 'ceilometer' $event_pipeline = '/etc/ceilometer/event_pipeline.yaml' diff --git a/releasenotes/notes/replace-deprecated-ceilometer-dbsync-ddf62d90341731d7.yaml b/releasenotes/notes/replace-deprecated-ceilometer-dbsync-ddf62d90341731d7.yaml new file mode 100644 index 00000000..e5f57aed --- /dev/null +++ b/releasenotes/notes/replace-deprecated-ceilometer-dbsync-ddf62d90341731d7.yaml @@ -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. diff --git a/spec/classes/ceilometer_db_sync_spec.rb b/spec/classes/ceilometer_db_sync_spec.rb index db598d81..f4b37b43 100644 --- a/spec/classes/ceilometer_db_sync_spec.rb +++ b/spec/classes/ceilometer_db_sync_spec.rb @@ -6,7 +6,7 @@ describe 'ceilometer::db::sync' do it 'runs ceilometer-dbsync' do 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', :refreshonly => 'true', :user => 'ceilometer', @@ -22,7 +22,7 @@ describe 'ceilometer::db::sync' do end 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', :user => 'ceilometer', :refreshonly => 'true',