From c5677205fad2b4024c2cfb0d2e7be4e4c3b6a408 Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Tue, 21 Oct 2014 13:30:44 +0000 Subject: [PATCH] Use absolute path in nodepool_template default value This change allows using absolute paths for 'nodepool_template', instead of assuming that the templates will always live within 'openstack_project/manifests/nodepool'. Change-Id: I480188d23b338c4011fd614c7377cb4c7e244ab5 Closes-Bug: 1383719 --- modules/openstack_project/manifests/nodepool_prod.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/manifests/nodepool_prod.pp b/modules/openstack_project/manifests/nodepool_prod.pp index 5b6db30040..a2b8e876f5 100644 --- a/modules/openstack_project/manifests/nodepool_prod.pp +++ b/modules/openstack_project/manifests/nodepool_prod.pp @@ -4,7 +4,7 @@ class openstack_project::nodepool_prod( $mysql_root_password, $mysql_password, $nodepool_ssh_private_key = '', - $nodepool_template = 'nodepool.yaml.erb', + $nodepool_template = 'openstack_project/nodepool/nodepool.yaml.erb', $sysadmins = [], $statsd_host = '', $jenkins_api_user ='', @@ -49,7 +49,7 @@ class openstack_project::nodepool_prod( owner => 'nodepool', group => 'root', mode => '0400', - content => template("openstack_project/nodepool/${nodepool_template}"), + content => template($nodepool_template), require => [ File['/etc/nodepool'], User['nodepool'],