diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index 09986c0c..6137e32b 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 undef +# Defaults to '--config-file /etc/glance/glance-registry.conf' # class glance::db::sync( - $extra_params = undef, + $extra_params = '--config-file /etc/glance/glance-registry.conf', ) { include ::glance::params diff --git a/manifests/params.pp b/manifests/params.pp index 6fbed16a..d8c18dc9 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -13,7 +13,6 @@ class glance::params { $registry_package_name = 'openstack-glance' $api_service_name = 'openstack-glance-api' $registry_service_name = 'openstack-glance-registry' - $db_sync_command = 'glance-manage --config-file=/etc/glance/glance-registry.conf db_sync' if ($::operatingsystem != 'fedora' and versioncmp($::operatingsystemrelease, '7') < 0) { $pyceph_package_name = 'python-ceph' } else { @@ -25,7 +24,6 @@ class glance::params { $registry_package_name = 'glance-registry' $api_service_name = 'glance-api' $registry_service_name = 'glance-registry' - $db_sync_command = 'glance-manage --config-file=/etc/glance/glance-registry.conf db_sync' $pyceph_package_name = 'python-ceph' } default: { diff --git a/spec/classes/glance_db_sync_spec.rb b/spec/classes/glance_db_sync_spec.rb index 4edf7ec4..1ba51bbb 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 db_sync', + :command => 'glance-manage --config-file /etc/glance/glance-registry.conf db_sync', :path => '/usr/bin', :user => 'glance', :refreshonly => 'true',