Merge "Stop hard-coding config file for db sync"
This commit is contained in:
commit
4f919dffcc
@ -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 => [
|
||||
|
@ -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 => [
|
||||
|
@ -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 => [
|
||||
|
@ -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 => [
|
||||
|
@ -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 => [
|
||||
|
@ -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]',
|
||||
|
@ -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]',
|
||||
|
@ -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]',
|
||||
|
@ -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]',
|
||||
|
@ -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]',
|
||||
|
Loading…
Reference in New Issue
Block a user