diff --git a/manifests/services/bgpvpn.pp b/manifests/services/bgpvpn.pp index c544b3c11..13f9283a6 100644 --- a/manifests/services/bgpvpn.pp +++ b/manifests/services/bgpvpn.pp @@ -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 => [ diff --git a/manifests/services/l2gw.pp b/manifests/services/l2gw.pp index c31df3042..833ff3bba 100644 --- a/manifests/services/l2gw.pp +++ b/manifests/services/l2gw.pp @@ -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 => [ diff --git a/manifests/services/sfc.pp b/manifests/services/sfc.pp index 260ab80e2..ebbb8cd70 100644 --- a/manifests/services/sfc.pp +++ b/manifests/services/sfc.pp @@ -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 => [ diff --git a/manifests/services/taas.pp b/manifests/services/taas.pp index 361acd41c..91b4d0eb7 100644 --- a/manifests/services/taas.pp +++ b/manifests/services/taas.pp @@ -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 => [ diff --git a/manifests/services/vpnaas.pp b/manifests/services/vpnaas.pp index a102e18bc..ca56b7279 100644 --- a/manifests/services/vpnaas.pp +++ b/manifests/services/vpnaas.pp @@ -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 => [ diff --git a/spec/classes/neutron_services_bgpvpn_spec.rb b/spec/classes/neutron_services_bgpvpn_spec.rb index dc44ffd33..7f6469fc3 100644 --- a/spec/classes/neutron_services_bgpvpn_spec.rb +++ b/spec/classes/neutron_services_bgpvpn_spec.rb @@ -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]', diff --git a/spec/classes/neutron_services_l2gw_spec.rb b/spec/classes/neutron_services_l2gw_spec.rb index 8bab73b98..f0386f585 100644 --- a/spec/classes/neutron_services_l2gw_spec.rb +++ b/spec/classes/neutron_services_l2gw_spec.rb @@ -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]', diff --git a/spec/classes/neutron_services_sfc_spec.rb b/spec/classes/neutron_services_sfc_spec.rb index 65d2d74a9..bfd2d3105 100644 --- a/spec/classes/neutron_services_sfc_spec.rb +++ b/spec/classes/neutron_services_sfc_spec.rb @@ -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]', diff --git a/spec/classes/neutron_services_taas_spec.rb b/spec/classes/neutron_services_taas_spec.rb index da7dd19ed..741fc06e1 100644 --- a/spec/classes/neutron_services_taas_spec.rb +++ b/spec/classes/neutron_services_taas_spec.rb @@ -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]', diff --git a/spec/classes/neutron_services_vpnaas_spec.rb b/spec/classes/neutron_services_vpnaas_spec.rb index 33218da28..831fd9b0f 100644 --- a/spec/classes/neutron_services_vpnaas_spec.rb +++ b/spec/classes/neutron_services_vpnaas_spec.rb @@ -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]',