From f8355fe112cc1cae1b93ad931ed66cc0fcfcb19d Mon Sep 17 00:00:00 2001 From: Graham Taylor Date: Tue, 23 Dec 2014 11:38:44 +0000 Subject: [PATCH 1/2] Fix some issues with 3.7.* Puppet --- .travis.yml | 3 ++- manifests/params.pp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6525117..f34ee1f 100755 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ env: - PUPPET_VERSION="~> 3.4.0" - PUPPET_VERSION="~> 3.5.0" - PUPPET_VERSION="~> 3.6.0" + - PUPPET_VERSION="~> 3.7.0" matrix: exclude: - rvm: 1.9.3 @@ -37,4 +38,4 @@ matrix: - rvm: 2.1.0 env: PUPPET_VERSION="~> 3.3.0" - rvm: 2.1.0 - env: PUPPET_VERSION="~> 3.4.0" \ No newline at end of file + env: PUPPET_VERSION="~> 3.4.0" diff --git a/manifests/params.pp b/manifests/params.pp index 42ff1c3..a91416b 100755 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -40,8 +40,8 @@ }] $host = '0.0.0.0' - $port = 3000 + $port = '3000' $user = '' $pass = '' - $refresh = 5 + $refresh = '5' } From 17e2486b2e2caf9caea541ed2bb606f2b1b455d7 Mon Sep 17 00:00:00 2001 From: Graham Taylor Date: Tue, 23 Dec 2014 16:53:47 +0000 Subject: [PATCH 2/2] Fix scope variables not getting to template file in 3.7 --- manifests/config.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/config.pp b/manifests/config.pp index 2042d32..9f1ce36 100755 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -2,7 +2,7 @@ # # This class is called from uchiwa # -class uchiwa::config { +class uchiwa::config inherits uchiwa { file { '/etc/sensu/uchiwa.json': ensure => file,