Merge pull request #31 from tayzlor/puppet-3.7-fixes

Fix some issues with 3.7.* Puppet
Yelp · Jan 2, 2015 · e48e3f0 · e48e3f0
2 parents 830793b + 17e2486
commit e48e3f0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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"
+      env: PUPPET_VERSION="~> 3.4.0"
diff --git 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,

diff --git 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'
 }