openstack
/
puppet-neutron
Code Issues Proposed changes

Stop hard-coding config file for db sync 

The neutron-db-manage command by default loads
/etc/neutron/neutron.conf. Removing the override allows us to use
additional paths such as neutron.conf.d in the future.

Change-Id: Iabeeb65e0ae94538245be288927b9f1ca64a3104
This commit is contained in:
Takashi Kajinami 2024-03-05 12:42:04 +09:00
parent 68cceacff2
commit 1b83195b68
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/services/bgpvpn.pp
View File

@ -70,7 +70,7 @@ class neutron::services::bgpvpn (
if $sync_db {
exec { 'bgpvpn-db-sync':
command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --subproject networking-bgpvpn upgrade head',
command => 'neutron-db-manage --subproject networking-bgpvpn upgrade head',
path => '/usr/bin',
user => $::neutron::params::user,
subscribe => [

2
manifests/services/l2gw.pp
View File

@ -85,7 +85,7 @@ class neutron::services::l2gw (
if $sync_db {
exec { 'l2gw-db-sync':
command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --subproject networking-l2gw upgrade head',
command => 'neutron-db-manage --subproject networking-l2gw upgrade head',
path => '/usr/bin',
user => $::neutron::params::user,
subscribe => [

2
manifests/services/sfc.pp
View File

@ -70,7 +70,7 @@ class neutron::services::sfc (
if $sync_db {
exec { 'sfc-db-sync':
command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --subproject networking-sfc upgrade head',
command => 'neutron-db-manage --subproject networking-sfc upgrade head',
path => '/usr/bin',
user => $::neutron::params::user,
subscribe => [

2
manifests/services/taas.pp
View File

@ -65,7 +65,7 @@ class neutron::services::taas (
if $sync_db {
exec { 'taas-db-sync':
command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --subproject tap-as-a-service upgrade head',
command => 'neutron-db-manage --subproject tap-as-a-service upgrade head',
path => '/usr/bin',
user => $::neutron::params::user,
subscribe => [

2
manifests/services/vpnaas.pp
View File

@ -53,7 +53,7 @@ class neutron::services::vpnaas (
if $sync_db {
exec { 'vpnaas-db-sync':
command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --subproject neutron-vpnaas upgrade head',
command => 'neutron-db-manage --subproject neutron-vpnaas upgrade head',
path => '/usr/bin',
user => $::neutron::params::user,
subscribe => [

2
spec/classes/neutron_services_bgpvpn_spec.rb
View File

@ -49,7 +49,7 @@ describe 'neutron::services::bgpvpn' do
it 'runs neutron-db-manage' do
should contain_exec('bgpvpn-db-sync').with(
:command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --subproject networking-bgpvpn upgrade head',
:command => 'neutron-db-manage --subproject networking-bgpvpn upgrade head',
:path => '/usr/bin',
:user => 'neutron',
:subscribe => ['Anchor[neutron::install::end]',

2
spec/classes/neutron_services_l2gw_spec.rb
View File

@ -74,7 +74,7 @@ describe 'neutron::services::l2gw' do
it 'runs neutron-db-manage' do
should contain_exec('l2gw-db-sync').with(
:command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --subproject networking-l2gw upgrade head',
:command => 'neutron-db-manage --subproject networking-l2gw upgrade head',
:path => '/usr/bin',
:user => 'neutron',
:subscribe => ['Anchor[neutron::install::end]',

2
spec/classes/neutron_services_sfc_spec.rb
View File

@ -45,7 +45,7 @@ describe 'neutron::services::sfc' do
it 'runs neutron-db-manage' do
should contain_exec('sfc-db-sync').with(
:command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --subproject networking-sfc upgrade head',
:command => 'neutron-db-manage --subproject networking-sfc upgrade head',
:path => '/usr/bin',
:user => 'neutron',
:subscribe => ['Anchor[neutron::install::end]',

2
spec/classes/neutron_services_taas_spec.rb
View File

@ -48,7 +48,7 @@ describe 'neutron::services::taas' do
it 'runs neutron-db-manage' do
should contain_exec('taas-db-sync').with(
:command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --subproject tap-as-a-service upgrade head',
:command => 'neutron-db-manage --subproject tap-as-a-service upgrade head',
:path => '/usr/bin',
:user => 'neutron',
:subscribe => ['Anchor[neutron::install::end]',

2
spec/classes/neutron_services_vpnaas_spec.rb
View File

@ -33,7 +33,7 @@ describe 'neutron::services::vpnaas' do
it 'runs neutron-db-manage' do
should contain_exec('vpnaas-db-sync').with(
:command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --subproject neutron-vpnaas upgrade head',
:command => 'neutron-db-manage --subproject neutron-vpnaas upgrade head',
:path => '/usr/bin',
:user => 'neutron',
:subscribe => ['Anchor[neutron::install::end]',