Merge "File resources use content not template."

This commit is contained in:
Jenkins 2014-07-03 22:54:44 +00:00 committed by Gerrit Code Review
commit 86573ce56f

View File

@ -130,12 +130,12 @@ class openstack_project::static (
}
file { '/etc/os_loganalyze/wsgi.conf':
ensure => present,
owner => 'root',
group => 'www-data',
mode => '0440',
template => 'openstack_project/os-loganalyze-wsgi.conf.erb',
require => File['/etc/os_loganalyze'],
ensure => present,
owner => 'root',
group => 'www-data',
mode => '0440',
content => template('openstack_project/os-loganalyze-wsgi.conf.erb'),
require => File['/etc/os_loganalyze'],
}
file { '/srv/static/logs/help':