From 182fb068aabda71bac417d2d6d087eaba834cc13 Mon Sep 17 00:00:00 2001 From: Matt Johnson Date: Thu, 24 Apr 2014 11:27:57 +0100 Subject: [PATCH 1/2] Booleans fail if wrapped in quotes, puppet identifies as strings --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0e939ebf6b..5a2e17139a 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ and configures Sensu on each individual node via sensu::dashboard_port: 8090 sensu::dashboard_password: mysupersecretpassword - sensu::install_repo: 'false' + sensu::install_repo: false sensu::purge_config: true sensu::rabbitmq_host: 10.31.0.90 sensu::rabbitmq_password: password @@ -111,7 +111,7 @@ and configures Sensu on each individual node via nosensu.foo.com.yaml - sensu::client: 'false' + sensu::client: false site.pp From 4d00cc8cb7a8f4d9f74eb7d9ac4b5da5744122d0 Mon Sep 17 00:00:00 2001 From: Matt Johnson Date: Thu, 24 Apr 2014 11:36:51 +0100 Subject: [PATCH 2/2] default vhost of /sensu isnt accepted by rabbitmq (vhosts shouldnt have / in the name) default of 'sensu' works better --- manifests/init.pp | 2 +- spec/classes/sensu_rabbitmq_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index a9dad98e44..a2e25ea4e9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -71,7 +71,7 @@ # # [*rabbitmq_vhost*] # String. Rabbitmq vhost to be used by sensu -# Default: '/sensu' +# Default: 'sensu' # # [*rabbitmq_ssl_private_key*] # String. Private key to be used by sensu to connect to rabbitmq diff --git a/spec/classes/sensu_rabbitmq_spec.rb b/spec/classes/sensu_rabbitmq_spec.rb index dab5ae3419..73b5f1bb8a 100644 --- a/spec/classes/sensu_rabbitmq_spec.rb +++ b/spec/classes/sensu_rabbitmq_spec.rb @@ -21,7 +21,7 @@ :rabbitmq_host => 'myhost', :rabbitmq_user => 'sensuuser', :rabbitmq_password => 'sensupass', - :rabbitmq_vhost => '/myvhost', + :rabbitmq_vhost => 'myvhost', } } it { should_not contain_file('/etc/sensu/ssl/cert.pem') } @@ -32,7 +32,7 @@ :host => 'myhost', :user => 'sensuuser', :password => 'sensupass', - :vhost => '/myvhost', + :vhost => 'myvhost', :ssl_cert_chain => '/etc/private/ssl/cert.pem', :ssl_private_key => '/etc/private/ssl/key.pem' ) }