From dd30888215c4ac95115b0fd3dabe58604d55b95d Mon Sep 17 00:00:00 2001 From: James Shubin Date: Thu, 8 May 2014 11:46:57 -0400 Subject: Workaround regression in newer puppet releases. In newer puppet versions the parser changed... I think it's requiring code in parse order now. --- manifests/xml.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/xml.pp b/manifests/xml.pp index 83bdfdb..489a7c5 100644 --- a/manifests/xml.pp +++ b/manifests/xml.pp @@ -19,6 +19,9 @@ class gluster::xml { include gluster::vardir include gluster::params + #$vardir = $::gluster::vardir::module_vardir # with trailing slash + $vardir = regsubst($::gluster::vardir::module_vardir, '\/$', '') + # argparse is built into python on new platforms and isn't needed here! if "${::gluster::params::package_python_argparse}" != '' { package { "${::gluster::params::package_python_argparse}": @@ -33,9 +36,6 @@ class gluster::xml { before => File["${vardir}/xml.py"], } - #$vardir = $::gluster::vardir::module_vardir # with trailing slash - $vardir = regsubst($::gluster::vardir::module_vardir, '\/$', '') - file { "${vardir}/xml.py": source => 'puppet:///modules/gluster/xml.py', owner => root, -- cgit