diff --git a/attributes/default.rb b/attributes/default.rb index 63a26a1..c061680 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -60,6 +60,7 @@ default['openstack']['telemetry']['identity-api']['auth']['version'] = node['openstack']['api']['auth']['version'] default['openstack']['telemetry-metric']['identity-api']['auth']['version'] = node['openstack']['api']['auth']['version'] +default['openstack']['telemetry-metric']['gnocchi-upgrade-options'] = '' %w(telemetry telemetry-metric).each do |ts| # specify whether to enable SSL for ceilometer API endpoint diff --git a/recipes/gnocchi_configure.rb b/recipes/gnocchi_configure.rb index cb7b70b..0089589 100644 --- a/recipes/gnocchi_configure.rb +++ b/recipes/gnocchi_configure.rb @@ -93,7 +93,8 @@ if node['openstack']['telemetry-metric']['conf']['storage']['driver'] == 'file' end # dbsync for gnocchi -execute 'gnocchi-upgrade' do +execute 'run gnocchi-upgrade' do + command "gnocchi-upgrade #{node['openstack']['telemetry-metric']['gnocchi-upgrade-options']}" user node['openstack']['telemetry-metric']['user'] end diff --git a/spec/gnocchi_configure_spec.rb b/spec/gnocchi_configure_spec.rb index f944f9c..277e844 100644 --- a/spec/gnocchi_configure_spec.rb +++ b/spec/gnocchi_configure_spec.rb @@ -111,8 +111,11 @@ describe 'openstack-telemetry::gnocchi_configure' do end it do - expect(chef_run).to run_execute('gnocchi-upgrade') - .with(user: 'gnocchi') + expect(chef_run).to run_execute('run gnocchi-upgrade') + .with( + command: 'gnocchi-upgrade ', + user: 'gnocchi' + ) end it do