merged quoted booleans

Author: jlambert121

manifests/client.pp

@@ -9,10 +9,11 @@
   $address        = $::ipaddress,
   $subscriptions  = [],
   $client_name    = $::fqdn,
-  $enabled        = true
+  $enabled        = 'true'
 ) {
 
   $ensure = $enabled ? {
+    'true'  => 'present',
     true    => 'present',
     default => 'absent'
   }

manifests/init.pp

@@ -9,8 +9,8 @@
 
 class sensu (
   $rabbitmq_password,
-  $server                   = false,
-  $client                   = true,
+  $server                   = 'false',
+  $client                   = 'true',
   $version                  = 'latest',
   $install_repo             = 'true',
   $rabbitmq_port            = '5671',
@@ -45,13 +45,13 @@
   Class['sensu::service::client'] ->
   Class['sensu']
 
-  if $server == true {
-    if $client == true {
+  if $server == 'true' or $server == true {
+    if $client == 'true' or $client == true {
       $notify_services = [ Class['sensu::service::client'], Class['sensu::service::server'] ]
     } else {
       $notify_services = Class['sensu::service::server']
     }
-  } elsif $client == true {
+  } elsif $client == 'true' or $client == true {
     $notify_services = Class['sensu::service::client']
   } else {
     $notify_services = []

manifests/server.pp

@@ -14,12 +14,13 @@
   $dashboard_port     = '8080',
   $dashboard_user     = 'admin',
   $dashboard_password = 'secret',
-  $enabled            = false
+  $enabled            = 'false'
 ) {
 
   $ensure = $enabled ? {
+    'true'  => 'present',
     true    => 'present',
-    false   => 'absent'
+    default => 'absent'
   }
 
   sensu_redis_config { $::fqdn:

manifests/service/client.pp

@@ -3,8 +3,9 @@
 ) {
 
   $real_ensure = $enabled ? {
-    true  => 'running',
-    false => 'stopped',
+    'true'  => 'running',
+    true    => 'running',
+    default => 'stopped',
   }
 
   service { 'sensu-client':

manifests/service/server.pp

@@ -3,8 +3,9 @@
 ) {
 
   $real_ensure = $enabled ? {
-    true  => 'running',
-    false => 'stopped',
+    'true'  => 'running',
+    true    => 'running',
+    default => 'stopped',
   }
 
   Service {

spec/classes/sensu_init_spec.rb

@@ -32,26 +32,24 @@
       'dashboard_port'      => '8080',
       'dashboard_user'      => 'admin',
       'dashboard_password'  => 'secret',
-      'enabled'             => false
+      'enabled'             => 'false'
     )}
 
     it { should contain_class('sensu::client').with(
       'address'       => '1.2.3.4',
       'subscriptions' => [],
       'client_name'   => 'myhost.domain.com',
-      'enabled'       => true
+      'enabled'       => 'true'
     )}
 
-    it { should contain_class('sensu::service::server').with_enabled(false) }
-    it { should contain_class('sensu::service::client').with_enabled(true) }
+    it { should contain_class('sensu::service::server').with_enabled('false') }
+    it { should contain_class('sensu::service::client').with_enabled('true') }
   end
 
 
   context 'setting all params' do
     let(:params) { {
       :rabbitmq_password        => 'asdfjkl',
-      :server                   => true,
-      :client                   => false,
       :version                  => '0.9.10',
       :install_repo             => false,
       :rabbitmq_port            => '1234',
@@ -99,22 +97,22 @@
       'dashboard_port'      => '5678',
       'dashboard_user'      => 'dashuser',
       'dashboard_password'  => 'dashpass',
-      'enabled'             => true
+      'enabled'             => 'true'
     )}
 
     it { should contain_class('sensu::client').with(
       'address'       => '127.0.0.1',
       'subscriptions' => ['all'],
       'client_name'   => 'myhost',
-      'enabled'       => false
+      'enabled'       => 'false'
     )}
 
-    it { should contain_class('sensu::service::server').with_enabled(true) }
-    it { should contain_class('sensu::service::client').with_enabled(false) }
+    it { should contain_class('sensu::service::server').with_enabled('true') }
+    it { should contain_class('sensu::service::client').with_enabled('false') }
   end
 
   context 'server and client' do
-    let(:params) { { :rabbitmq_password => 'asdfjkl', :server => true, :client => true } }
+    let(:params) { { :rabbitmq_password => 'asdfjkl', :server => 'true', :client => 'true' } }
     let(:facts) { { :fqdn => 'myhost.domain.com', :ipaddress => '1.2.3.4' } }
 
     it { should contain_class('sensu::rabbitmq').with(
@@ -123,7 +121,7 @@
   end
 
   context 'neither server nor client' do
-    let(:params) { { :rabbitmq_password => 'asdfjkl', :server => false, :client => false } }
+    let(:params) { { :rabbitmq_password => 'asdfjkl', :server => 'false', :client => 'false' } }
     let(:facts) { { :fqdn => 'myhost.domain.com', :ipaddress => '1.2.3.4' } }
 
     it { should contain_class('sensu::rabbitmq').with(

spec/classes/sensu_server_spec.rb

@@ -13,7 +13,7 @@
 
   context 'defaults (enabled)' do
     let(:facts) { { :fqdn => 'testhost.domain.com', :ipaddress => '1.2.3.4' } }
-    let(:params) { { :enabled => true } }
+    let(:params) { { :enabled => 'true' } }
 
     it { should contain_sensu_redis_config('testhost.domain.com').with(
       'host'    => 'localhost',
@@ -54,7 +54,7 @@
       :dashboard_port           => '5678',
       :dashboard_user           => 'user',
       :dashboard_password       => 'mypass',
-      :enabled                  => true
+      :enabled                  => 'true'
     } }
 
     it { should contain_sensu_redis_config('testhost.domain.com').with(

spec/classes/sensu_service_client.pp spec/classes/sensu_service_client.rb

@@ -3,45 +3,45 @@
 describe 'sensu::service::server', :type => :class do
 
   context 'enabled' do
-    let(:params) { { :enabled => true } }
+    let(:params) { { :enabled => 'true' } }
 
     it { should contain_service('sensu-server').with(
       'ensure'      => 'running',
-      'enable'      => true,
+      'enable'      => 'true',
       'hasrestart'  => true
     ) }
 
     it { should contain_service('sensu-api').with(
       'ensure'      => 'running',
-      'enable'      => true,
+      'enable'      => 'true',
       'hasrestart'  => true
     ) }
 
     it { should contain_service('sensu-dashboard').with(
       'ensure'      => 'running',
-      'enable'      => true,
+      'enable'      => 'true',
       'hasrestart'  => true
     ) }
   end
 
   context 'disabled' do
-    let(:params) { { :enabled => false } }
+    let(:params) { { :enabled => 'false' } }
 
     it { should contain_service('sensu-server').with(
       'ensure'      => 'stopped',
-      'enable'      => false,
+      'enable'      => 'false',
       'hasrestart'  => true
     ) }
 
     it { should contain_service('sensu-api').with(
       'ensure'      => 'stopped',
-      'enable'      => false,
+      'enable'      => 'false',
       'hasrestart'  => true
     ) }
 
     it { should contain_service('sensu-dashboard').with(
       'ensure'      => 'stopped',
-      'enable'      => false,
+      'enable'      => 'false',
       'hasrestart'  => true
     ) }