Do not skip gnocchi resource type creation by default in db::sync

The default command-line option for ceilometer-upgrade is to not
skip gnocchi resource type creation. If we do not pass any extra_params
to the ceilometer::db::sync class, we should keep defaults.

This has not failed before in CI because p-o-i was passing
'--skip-metering-database' as extra_params, but now we are removing
that deprecated option in [1].

[1] - https://review.openstack.org/548337

Change-Id: I33c1667e19326ec67c5cf953daa1237175895c4f
(cherry picked from commit e985087545cf116ea30a8d270e4adb11aa86f994)

diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index db08f6dfe80c281899fdb1f6fd587a3a556cd933..07d400f3643af3a887f10ab66022bec5b49b9577 100644 (file)
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -7,10 +7,10 @@
 # [*extra_params*]
 #   (Optional) String of extra command line parameters
 #   to append to the ceilometer-upgrade command.
-#   Defaults to '--skip-gnocchi-resource-types'.
+#   Defaults to undef.
 #
 class ceilometer::db::sync(
-  $extra_params = '--skip-gnocchi-resource-types',
+  $extra_params = undef,
 ) {
 
   include ::ceilometer::deps

diff --git a/releasenotes/notes/ceilometer-db-dont-skip-gnocchi-resource-types-a278ceb929a42da3.yaml b/releasenotes/notes/ceilometer-db-dont-skip-gnocchi-resource-types-a278ceb929a42da3.yaml
new file mode 100644 (file)
index 0000000..279ba16
--- /dev/null
+++ b/releasenotes/notes/ceilometer-db-dont-skip-gnocchi-resource-types-a278ceb929a42da3.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    The extra_params to ceilometer::db::sync does not default to
+    using --skip-gnocchi-resource-types now. If you are running
+    ceilometer without gnocchi you need to pass this argument
+    manually in ceilometer::db::sync::extra_params so it's
+    appaneded to the ceilometer-upgrade call.

diff --git a/spec/acceptance/ceilometer_wsgi_apache_spec.rb b/spec/acceptance/ceilometer_wsgi_apache_spec.rb
index 677768fca95c062a18e15a91826b294d806cbcbd..5994c0107f6cb0525287df3c63611b21d3a9ef06 100644 (file)
--- a/spec/acceptance/ceilometer_wsgi_apache_spec.rb
+++ b/spec/acceptance/ceilometer_wsgi_apache_spec.rb
@@ -47,6 +47,8 @@ describe 'ceilometer with mysql' do
         database_connection => 'mysql+pymysql://ceilometer:a_big_secret@127.0.0.1/ceilometer?charset=utf8',
        sync_db             => false,
       }
+      # NOTE(tobasco): When running the beaker tests we need to exclude the
+      # gnocchi resource types since the acceptance test does not setup gnocchi itself.
       class { '::ceilometer::db::sync':
         extra_params => '--skip-gnocchi-resource-types',
       }

diff --git a/spec/classes/ceilometer_db_sync_spec.rb b/spec/classes/ceilometer_db_sync_spec.rb
index f57e132fc80e023d3de05340d8d1ac7c576412c3..d7940190bdd2bb68636becc2a68f1c5369163c37 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-upgrade' do
       is_expected.to contain_exec('ceilometer-upgrade').with(
-        :command     => 'ceilometer-upgrade --skip-gnocchi-resource-types',
+        :command     => 'ceilometer-upgrade ',
         :path        => '/usr/bin',
         :refreshonly => 'true',
         :user        => 'ceilometer',