diff options
| author | James Shubin <james@shubin.ca> | 2014-05-08 11:46:57 -0400 |
|---|---|---|
| committer | James Shubin <james@shubin.ca> | 2014-05-08 11:46:57 -0400 |
| commit | dd30888215c4ac95115b0fd3dabe58604d55b95d (patch) | |
| tree | 5eb01bdd2a0deda390789152dd57db633cf9843c | |
| parent | 96e47737382964d2a8b6e80e5801973fc69c2b5a (diff) | |
| download | puppet-gluster-dd30888215c4ac95115b0fd3dabe58604d55b95d.tar.gz puppet-gluster-dd30888215c4ac95115b0fd3dabe58604d55b95d.tar.xz puppet-gluster-dd30888215c4ac95115b0fd3dabe58604d55b95d.zip | |
Workaround regression in newer puppet releases.
In newer puppet versions the parser changed... I think it's requiring
code in parse order now.
| -rw-r--r-- | manifests/xml.pp | 6 |
1 files 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, |