Don't pass glance-registry.conf in every sync_db

Since it's possible to run glance-api without glance-registry, we
shouldn't be passing the registry config file in every database sync.

This patch keeps the extra_param so that we can pass the config file if
the registry is enabled from other places.

Depends-On: Ib9f511219e8cb9a7322745b6bd7c4f9c9cc0c198
Change-Id: I4e7570bdc1b8d89c9914855fd8eec13688fbf9f3
This commit is contained in:
Flavio Percoco 2016-12-08 11:46:34 +01:00 committed by Emilien Macchi
parent e6a6df773b
commit 07a7b66bae
2 changed files with 3 additions and 3 deletions

View File

@ -7,10 +7,10 @@
# (optional) String of extra command line parameters to append
# to the glance-manage db sync command. These will be inserted
# in the command line between 'glance-manage' and 'db sync'.
# Defaults to '--config-file /etc/glance/glance-registry.conf'
# Defaults to ''
#
class glance::db::sync(
$extra_params = '--config-file /etc/glance/glance-registry.conf',
$extra_params = '',
) {
include ::glance::deps

View File

@ -6,7 +6,7 @@ describe 'glance::db::sync' do
it 'runs glance-manage db_sync' do
is_expected.to contain_exec('glance-manage db_sync').with(
:command => 'glance-manage --config-file /etc/glance/glance-registry.conf db_sync',
:command => 'glance-manage db_sync',
:path => '/usr/bin',
:user => 'glance',
:refreshonly => 'true',