summaryrefslogtreecommitdiffstats
path: root/manifests/volume/property
diff options
context:
space:
mode:
authorJames Shubin <james@shubin.ca>2013-06-03 19:54:43 -0400
committerJames Shubin <james@shubin.ca>2013-06-03 19:54:43 -0400
commit2a65757ead328e87e2ae656d39040d5c96bc2f0d (patch)
treedc03e044baa50959d1ae3df1285d9fa6b5f50a69 /manifests/volume/property
parent9aae259df87ab22b47185d9ff61d1d0020f33d2a (diff)
downloadpuppet-gluster-2a65757ead328e87e2ae656d39040d5c96bc2f0d.tar.gz
puppet-gluster-2a65757ead328e87e2ae656d39040d5c96bc2f0d.tar.xz
puppet-gluster-2a65757ead328e87e2ae656d39040d5c96bc2f0d.zip
Cleanup some small things.
Diffstat (limited to 'manifests/volume/property')
-rw-r--r--manifests/volume/property/base.pp12
1 files changed, 10 insertions, 2 deletions
diff --git a/manifests/volume/property/base.pp b/manifests/volume/property/base.pp
index 04c7ccc..4d5149d 100644
--- a/manifests/volume/property/base.pp
+++ b/manifests/volume/property/base.pp
@@ -16,18 +16,26 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
class gluster::volume::property::base {
+ include gluster::vardir
+
package { 'python-lxml': # for parsing gluster xml output
ensure => present,
}
- file { '/var/lib/puppet/tmp/gluster/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,
group => nobody,
mode => 700, # u=rwx
backup => false, # don't backup to filebucket
ensure => present,
- require => Package['python-lxml'],
+ require => [
+ Package['python-lxml'],
+ File["${vardir}/"],
+ ],
}
}