openstack/puppet-neutron
Code Issues Proposed changes

Don't pass any --config-file arguments to neutron-db-manage

Browse Source 
The plugin config file is not needed since Juno because now schema does
not depend on plugin used; and oslo.config is capable of finding
neutron.conf by the virtue of its auto-discovery mechanism.

Change-Id: Icc4de9824ef95781a1d060534973c2bbf8e03059
This commit is contained in:
Ihar Hrachyshka
2016-12-03 03:54:15 +00:00
parent cbe9fd1207
commit ffb17d82e5
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/db/sync.pp
View File

@@ -5,13 +5,13 @@
# #
# [*extra_params*] # [*extra_params*]
# (optional) String of extra command line parameters to append # (optional) String of extra command line parameters to append
# to the neutron-db-manage upgrade head command. These will be # to the neutron-db-manage upgrade heads command. These will be
# inserted in the command line between 'neutron-db-manage' and # inserted in the command line between 'neutron-db-manage' and
# 'upgrade head'. # 'upgrade heads'.
# Defaults to '--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini' # Defaults to ''
# #
class neutron::db::sync( class neutron::db::sync(
$extra_params = '--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini', $extra_params = '',
) { ) {
include ::neutron::deps include ::neutron::deps

2
manifests/plugins/midonet.pp
View File

@@ -138,7 +138,7 @@ class neutron::plugins::midonet (
if $sync_db { if $sync_db {
Package<| title == 'python-networking-midonet' |> ~> Exec['midonet-db-sync'] Package<| title == 'python-networking-midonet' |> ~> Exec['midonet-db-sync']
exec { 'midonet-db-sync': exec { 'midonet-db-sync':
command => 'neutron-db-manage --subproject networking-midonet upgrade head', command => 'neutron-db-manage --subproject networking-midonet upgrade heads',
path => '/usr/bin', path => '/usr/bin',
subscribe => [ subscribe => [
Anchor['neutron::install::end'], Anchor['neutron::install::end'],

2
spec/classes/neutron_db_sync_spec.rb
View File

@@ -6,7 +6,7 @@ describe 'neutron::db::sync' do
it 'runs neutron-db-sync' do it 'runs neutron-db-sync' do
is_expected.to contain_exec('neutron-db-sync').with( is_expected.to contain_exec('neutron-db-sync').with(
:command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini upgrade heads', :command => 'neutron-db-manage upgrade heads',
:path => '/usr/bin', :path => '/usr/bin',
:refreshonly => 'true', :refreshonly => 'true',
:try_sleep => 5, :try_sleep => 5,