From 07a7b66bae9f75514fb3fe8f1b67d515005f06af Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Thu, 8 Dec 2016 11:46:34 +0100 Subject: [PATCH] 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 --- manifests/db/sync.pp | 4 ++-- spec/classes/glance_db_sync_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index 3a87ca80..357be0d0 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -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 diff --git a/spec/classes/glance_db_sync_spec.rb b/spec/classes/glance_db_sync_spec.rb index 90eb4a53..ec2f3c2f 100644 --- a/spec/classes/glance_db_sync_spec.rb +++ b/spec/classes/glance_db_sync_spec.rb @@ -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',