Allow customization of db sync command line

Add $extra_params parameter to neutron::db::sync class to
allow end users to add command line parameters to db sync command.

Change-Id: Ideeeb70115bcec8526444c142b54890707bfbf61
Partial-bug: #1472740
This commit is contained in:
Nate Potter 2015-11-02 22:34:06 +00:00
parent 20fa3e00f5
commit 091116d509
2 changed files with 30 additions and 2 deletions

View File

@ -1,7 +1,18 @@
# #
# Class to execute neutron dbsync # Class to execute neutron dbsync
# #
class neutron::db::sync { # ==Parameters
#
# [*extra_params*]
# (optional) String of extra command line parameters to append
# to the neutron-db-manage upgrade head command. These will be
# inserted in the command line between 'neutron-db-manage' and
# 'upgrade head'.
# Defaults to '--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini'
#
class neutron::db::sync(
$extra_params = '--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini',
) {
include ::neutron::params include ::neutron::params
@ -12,7 +23,7 @@ class neutron::db::sync {
Neutron_config<| title == 'database/connection' |> ~> Exec['neutron-db-sync'] Neutron_config<| title == 'database/connection' |> ~> Exec['neutron-db-sync']
exec { 'neutron-db-sync': exec { 'neutron-db-sync':
command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini upgrade head', command => "neutron-db-manage ${extra_params} upgrade head",
path => '/usr/bin', path => '/usr/bin',
refreshonly => true, refreshonly => true,
logoutput => on_failure, logoutput => on_failure,

View File

@ -13,6 +13,23 @@ describe 'neutron::db::sync' do
) )
end end
describe "overriding extra_params" do
let :params do
{
:extra_params => '--config-file /etc/neutron/neutron.conf',
}
end
it {
is_expected.to contain_exec('neutron-db-sync').with(
:command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf upgrade head',
:path => '/usr/bin',
:refreshonly => 'true',
:logoutput => 'on_failure'
)
}
end
end end
context 'on a RedHat osfamily' do context 'on a RedHat osfamily' do