openstack
/
cookbook-openstack-telemetry
Code Issues Proposed changes

Merge "Add an option variable to gnocchi-upgrade command"

This commit is contained in:
Jenkins 2017-02-20 13:06:11 +00:00 committed by Gerrit Code Review
parent 73fa9aa276 3b8259871e
commit 3d4ebe0106
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
attributes/default.rb
View File

@ -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

3
recipes/gnocchi_configure.rb
View File

@ -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

7
spec/gnocchi_configure_spec.rb
View File

@ -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