opendev/puppet-storyboard
Code Issues Proposed changes

Fixed location of storyboard configuration file

Browse Source 
For some reason, storyboard's config is again trying to read from
/etc/storyboard/storyboard.conf rather than /etc/storyboard.conf. This
fixes our configuration.

Change-Id: I978b8cd99744fabfab7fdf5b1d63bd54396350ed
This commit is contained in:
Michael Krotscheck 2014-08-08 13:32:36 -07:00 committed by Spencer Krum
parent 4fdd12b7f5
commit 79fe352c7c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/application.pp
View File

@ -55,7 +55,7 @@ class storyboard::application (
} }
# Configure the StoryBoard API # Configure the StoryBoard API
file { '/etc/storyboard.conf': file { '/etc/storyboard/storyboard.conf':
ensure => present, ensure => present,
owner => $storyboard::params::user, owner => $storyboard::params::user,
group => $storyboard::params::group, group => $storyboard::params::group,
@ -115,16 +115,16 @@ class storyboard::application (
# Migrate the database # Migrate the database
exec { 'migrate-storyboard-db': exec { 'migrate-storyboard-db':
command => 'storyboard-db-manage --config-file /etc/storyboard.conf upgrade head', command => 'storyboard-db-manage --config-file /etc/storyboard/storyboard.conf upgrade head',
path => '/usr/local/bin:/usr/bin:/bin/', path => '/usr/local/bin:/usr/bin:/bin/',
refreshonly => true, refreshonly => true,
subscribe => [ subscribe => [
Exec['install-storyboard'], Exec['install-storyboard'],
File['/etc/storyboard.conf'], File['/etc/storyboard/storyboard.conf'],
], ],
require => [ require => [
Class['mysql::python'], Class['mysql::python'],
File['/etc/storyboard.conf'], File['/etc/storyboard/storyboard.conf'],
], ],
notify => Service['httpd'], notify => Service['httpd'],
} }

2
manifests/load_projects.pp
View File

@ -47,7 +47,7 @@ class storyboard::load_projects (
} }
exec { 'load-projects-yaml': exec { 'load-projects-yaml':
command => "storyboard-db-manage --config-file /etc/storyboard.conf load_projects ${project_file_path}", command => "storyboard-db-manage --config-file /etc/storyboard/storyboard.conf load_projects ${project_file_path}",
path => '/usr/local/bin:/usr/bin:/bin/', path => '/usr/local/bin:/usr/bin:/bin/',
refreshonly => true, refreshonly => true,
subscribe => File[$project_file_path], subscribe => File[$project_file_path],

2
manifests/load_superusers.pp
View File

@ -43,7 +43,7 @@ class storyboard::load_superusers (
} }
exec { 'load-superusers-yaml': exec { 'load-superusers-yaml':
command => "storyboard-db-manage --config-file /etc/storyboard.conf load_superusers ${superuser_file_path}", command => "storyboard-db-manage --config-file /etc/storyboard/storyboard.conf load_superusers ${superuser_file_path}",
path => '/usr/local/bin:/usr/bin:/bin/', path => '/usr/local/bin:/usr/bin:/bin/',
refreshonly => true, refreshonly => true,
subscribe => File[$superuser_file_path], subscribe => File[$superuser_file_path],