diff options
author | varac <varacanero@zeromail.org> | 2013-06-14 19:47:07 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2013-06-14 19:47:07 +0200 |
commit | 8a54ee6ff08c7b498e8da8f5e8ca6827c4d0ff58 (patch) | |
tree | 724e8d8fbb9970a5f1f420bd36fbd410a45b6bfc /manifests/centos.pp | |
parent | 65dc795b3f2ec99a08b652c2b59555235dbca48b (diff) | |
parent | 1e6fbdf7f1f7e381ef01170eab96727377abe3b6 (diff) |
Merge remote-tracking branch 'leap/parameterized_classes'
Conflicts:
manifests/init.pp
Diffstat (limited to 'manifests/centos.pp')
-rw-r--r-- | manifests/centos.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/centos.pp b/manifests/centos.pp index 4283cb0..b9a326a 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -23,7 +23,7 @@ class stunnel::centos inherits stunnel::linux { file { '/etc/stunnel/stunnel.conf': source => [ "puppet:///modules/site-stunnel/${::fqdn}/stunnel.conf", - "puppet:///modules/site-stunnel/${stunnel_cluster}/stunnel.conf", + "puppet:///modules/site-stunnel/${stunnel::cluster}/stunnel.conf", 'puppet:///modules/site-stunnel/stunnel.conf', "puppet:///modules/stunnel/${::operatingsystem}/stunnel.conf" ], require => Package['stunnel'], |