Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
Workaround regression in newer puppet releases.
Browse files Browse the repository at this point in the history
In newer puppet versions the parser changed... I think it's requiring
code in parse order now.
  • Loading branch information
purpleidea committed May 8, 2014
1 parent 96e4773 commit dd30888
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions manifests/xml.pp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
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}":
Expand All @@ -33,9 +36,6 @@
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,
Expand Down

0 comments on commit dd30888

Please sign in to comment.