opendev/system-config
Code Issues Proposed changes

Merge "Use absolute path in nodepool_template default value"

Browse Source
This commit is contained in:
Jenkins 2014-10-23 09:04:03 +00:00 committed by Gerrit Code Review
commit 73d8c7709d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openstack_project/manifests/nodepool_prod.pp
View File

@ -4,7 +4,7 @@ class openstack_project::nodepool_prod(
$mysql_root_password, $mysql_root_password,
$mysql_password, $mysql_password,
$nodepool_ssh_private_key = '', $nodepool_ssh_private_key = '',
$nodepool_template = 'nodepool.yaml.erb', $nodepool_template = 'openstack_project/nodepool/nodepool.yaml.erb',
$sysadmins = [], $sysadmins = [],
$statsd_host = '', $statsd_host = '',
$jenkins_api_user ='', $jenkins_api_user ='',
@ -49,7 +49,7 @@ class openstack_project::nodepool_prod(
owner => 'nodepool', owner => 'nodepool',
group => 'root', group => 'root',
mode => '0400', mode => '0400',
content => template("openstack_project/nodepool/${nodepool_template}"), content => template($nodepool_template),
require => [ require => [
File['/etc/nodepool'], File['/etc/nodepool'],
User['nodepool'], User['nodepool'],