openstack
/
puppet-neutron
Code Issues Proposed changes

dbsync: upgrade with 'heads' not 'head' 

Neutron changed the CLI to run db upgrades with heads, not head anymore.

This change was long time ago, and we didn't catch it:
https://review.openstack.org/#/c/194198/

Change-Id: I5946d3d965e6d5f5d0a1d7e5d6f3233453a9baa7
This commit is contained in:
Emilien Macchi 2016-09-02 08:16:31 -04:00
parent 258f7f2529
commit e48383a14f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/db/sync.pp
View File

@ -18,7 +18,7 @@ class neutron::db::sync(
include ::neutron::params
exec { 'neutron-db-sync':
command => "neutron-db-manage ${extra_params} upgrade head",
command => "neutron-db-manage ${extra_params} upgrade heads",
path => '/usr/bin',
refreshonly => true,
logoutput => on_failure,

4
spec/classes/neutron_db_sync_spec.rb
View File

@ -6,7 +6,7 @@ describe 'neutron::db::sync' do
it 'runs neutron-db-sync' do
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 head',
:command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini upgrade heads',
:path => '/usr/bin',
:refreshonly => 'true',
:logoutput => 'on_failure'
@ -22,7 +22,7 @@ describe 'neutron::db::sync' do
it {
is_expected.to contain_exec('neutron-db-sync').with(
:command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf upgrade head',
:command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf upgrade heads',
:path => '/usr/bin',
:refreshonly => 'true',
:logoutput => 'on_failure'