Merge "Add an option variable to gnocchi-upgrade command"
This commit is contained in:
commit
3d4ebe0106
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue