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

diff --git a/manifests/db.pp b/manifests/db.pp
index 226e32e0ad640226be7dbf4dd564303648e01724..ed489aaac57851c51b6ad613618dc5e2a75e0dd2 100644 (file)
--- 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 3a747af5d8ebbcad3c78f461201a90d0484e5b1e..af5b8bc2cc505fa1dda5793b190de5609cd198a5 100644 (file)
--- 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 386e31a8093870fa091ccc604e8a437de583aaa6..a67c44d0a7cb36da01bf7ad7eae7d41991090ba5 100644 (file)
--- 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 (file)
index 0000000..e5f57ae
--- /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 db598d81d9854c0553c1eff650b6da4953c0c9ee..f4b37b438f0159375bcd790856f6c404406cf8b0 100644 (file)
--- 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',