openstack/puppet-watcher
Code Issues Proposed changes

Revert "Fix upgrade command"

Browse Source 
They changed their mind and are back to an upgrade
without 'head' as per https://review.openstack.org/#/c/485495/

This reverts commit 3653345f1c.

Change-Id: I2b33771899659bb7b32fce02eaa0ddcfb6656ad0
This commit is contained in:
David Moreau Simard 2017-07-21 04:13:33 +00:00
parent 3653345f1c
commit 824147d470
3 changed files with 3 additions and 7 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 head", command => "watcher-db-manage ${extra_params} upgrade",
path => '/usr/bin', path => '/usr/bin',
user => 'watcher', user => 'watcher',
refreshonly => true, refreshonly => true,

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

@ -1,4 +0,0 @@
---
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 head', :command => 'watcher-db-manage --config-file /etc/watcher/watcher.conf upgrade',
: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 head', :command => 'watcher-db-manage --config-file /etc/watcher/watcher01.conf upgrade',
:path => '/usr/bin', :path => '/usr/bin',
:user => 'watcher', :user => 'watcher',
:refreshonly => 'true', :refreshonly => 'true',