From 4a3cd372fdb9b1911eb9062dc5bb6ef41ad8d604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= Date: Sat, 8 Feb 2014 00:31:13 +0100 Subject: [PATCH] dashboard: more puppetish syntax --- manifests/dashboard.pp | 3 +-- spec/classes/cloud_dashboard_spec.rb | 12 ++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index 5ac7ab62..9243a0e1 100644 --- a/manifests/dashboard.pp +++ b/manifests/dashboard.pp @@ -70,8 +70,7 @@ class cloud::dashboard( $debug = $os_params::debug ) { - $supported = [ 'RedHat', 'Debian' ] - if grep($supported, $::osfamily) != [$::osfamily] { + if ! ($::osfamily in [ 'RedHat', 'Debian' ]) { fail("module puppet-horizon doesn't support ${::osfamily}") } diff --git a/spec/classes/cloud_dashboard_spec.rb b/spec/classes/cloud_dashboard_spec.rb index 83bcd005..b542c240 100644 --- a/spec/classes/cloud_dashboard_spec.rb +++ b/spec/classes/cloud_dashboard_spec.rb @@ -71,4 +71,16 @@ describe 'cloud::dashboard' do it_configures 'openstack dashboard' end + context 'on other platforms' do + let :facts do + { :osfamily => 'Solaris', + :operatingsystemrelease => '10', + :concat_basedir => '/var/lib/puppet/concat' } + end + + it 'should fail' do + expect { subject }.to raise_error(/module puppet-horizon doesn't support/) + end + end + end