openstack/puppet-watcher
Code Issues Proposed changes

Fix upgrade command

Browse Source 
Make our upgrade class match devstack.
2d98d5e743/devstack/lib/watcher (L238)

Change-Id: I02ce5e52f78282c394b086b8643655dbe226bd68
This commit is contained in:
Alex Schultz 2017-05-12 09:36:17 -06:00
parent a3f63f3199
commit 3653345f1c
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/db/upgrade.pp
View File

@ -16,7 +16,7 @@ class watcher::db::upgrade(
include ::watcher::deps include ::watcher::deps
exec { 'watcher-db-manage-upgrade': exec { 'watcher-db-manage-upgrade':
command => "watcher-db-manage ${extra_params} upgrade", command => "watcher-db-manage ${extra_params} upgrade head",
path => '/usr/bin', path => '/usr/bin',
user => 'watcher', user => 'watcher',
refreshonly => true, refreshonly => true,

4
releasenotes/notes/fix-db-upgrade-5dc1d2c07d26774a.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- |
Fix db upgrade class to use 'watcher-db-manager upgrade head'.

4
spec/classes/watcher_db_upgrade_spec.rb
View File

@ -6,7 +6,7 @@ describe 'watcher::db::upgrade' do
it 'runs watcher-db-manage' do it 'runs watcher-db-manage' do
is_expected.to contain_exec('watcher-db-manage-upgrade').with( is_expected.to contain_exec('watcher-db-manage-upgrade').with(
:command => 'watcher-db-manage --config-file /etc/watcher/watcher.conf upgrade', :command => 'watcher-db-manage --config-file /etc/watcher/watcher.conf upgrade head',
:path => '/usr/bin', :path => '/usr/bin',
:user => 'watcher', :user => 'watcher',
:refreshonly => 'true', :refreshonly => 'true',
@ -30,7 +30,7 @@ describe 'watcher::db::upgrade' do
it { it {
is_expected.to contain_exec('watcher-db-manage-upgrade').with( is_expected.to contain_exec('watcher-db-manage-upgrade').with(
:command => 'watcher-db-manage --config-file /etc/watcher/watcher01.conf upgrade', :command => 'watcher-db-manage --config-file /etc/watcher/watcher01.conf upgrade head',
:path => '/usr/bin', :path => '/usr/bin',
:user => 'watcher', :user => 'watcher',
:refreshonly => 'true', :refreshonly => 'true',