Switch puppet-ceph to rspec-puppet-facts

Change-Id: I17bbb499971499f96588cc5a98e1420b9abbdd42

manifests/osd.pp

@@ -57,6 +57,8 @@ define ceph::osd (
   $fsid = $::ceph::profile::params::fsid,
   ) {
 
+    include ::ceph::params
+
     $data = $name
 
     if $cluster {

spec/classes/ceph_init_spec.rb

@@ -142,23 +142,16 @@ describe 'ceph' do
     end
   end
 
-  describe 'Debian Family' do
+  on_supported_os({
-    let :facts do
+    :supported_os => OSDefaults.get_supported_os
-      {
+  }).each do |os,facts|
-        :osfamily => 'Debian',
+    context "on #{os}" do
-      }
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts())
       end
 
-    it_configures 'ceph'
+      it_behaves_like 'ceph'
+    end
   end
 
-  describe 'RedHat Family' do
-    let :facts do
-      {
-        :osfamily => 'RedHat',
-      }
-    end
-
-    it_configures 'ceph'
-  end
 end

spec/classes/ceph_mds_spec.rb

@@ -54,24 +54,16 @@ describe 'ceph::mds' do
     end
   end
 
-  describe 'Debian Family' do
+  on_supported_os({
-    let :facts do
+    :supported_os => OSDefaults.get_supported_os
-      {
+  }).each do |os,facts|
-        :osfamily => 'Debian',
+    context "on #{os}" do
-      }
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts())
       end
 
-    it_configures 'ceph mds'
+      it_behaves_like 'ceph mds'
     end
-
-  describe 'RedHat Family' do
-    let :facts do
-      {
-        :osfamily => 'RedHat',
-      }
-    end
-
-    it_configures 'ceph mds'
   end
 
 end

spec/classes/ceph_mons_spec.rb

@@ -46,37 +46,16 @@ describe 'ceph::mons' do
     }
   end
 
-  describe 'Ubuntu' do
+  on_supported_os({
-    let :facts do
+    :supported_os => OSDefaults.get_supported_os
-      {
+  }).each do |os,facts|
-        :osfamily => 'Debian',
+    context "on #{os}" do
-        :operatingsystem => 'Ubuntu',
+      let (:facts) do
-      }
+        facts.merge!(OSDefaults.get_facts())
       end
 
-    it_configures 'ceph mons'
+      it_behaves_like 'ceph mons'
     end
-
-  describe 'Debian' do
-    let :facts do
-      {
-        :osfamily => 'Debian',
-        :operatingsystem => 'Debian',
-      }
-    end
-
-    it_configures 'ceph mons'
-  end
-
-  describe 'RHEL7' do
-    let :facts do
-      {
-        :osfamily                  => 'RedHat',
-        :operatingsystemmajrelease => '7',
-      }
-    end
-
-    it_configures 'ceph mons'
   end
 
 end

spec/classes/ceph_osds_spec.rb

@@ -58,38 +58,18 @@ describe 'ceph::osds' do
     end
   end
 
-  describe 'Ubuntu' do
+  on_supported_os({
-    let :facts do
+    :supported_os => OSDefaults.get_supported_os
-      {
+  }).each do |os,facts|
-        :osfamily => 'Debian',
+    context "on #{os}" do
-        :operatingsystem => 'Ubuntu',
+      let (:facts) do
-      }
+        facts.merge!(OSDefaults.get_facts())
       end
 
-    it_configures 'ceph osds'
+      it_behaves_like 'ceph osds'
+    end
   end
 
-  describe 'Debian' do
-    let :facts do
-      {
-        :osfamily => 'Debian',
-        :operatingsystem => 'Debian',
-      }
-    end
-
-    it_configures 'ceph osds'
-  end
-
-  describe 'RedHat' do
-    let :facts do
-      {
-        :osfamily => 'RedHat',
-        :operatingsystem => 'RedHat',
-      }
-    end
-
-    it_configures 'ceph osds'
-  end
 end
 
 # Local Variables:

spec/defines/ceph_key_spec.rb

@@ -57,26 +57,16 @@ describe 'ceph::key' do
     end
   end
 
-  describe 'Debian Family' do
+  on_supported_os({
-
+    :supported_os => OSDefaults.get_supported_os
-    let :facts do
+  }).each do |os,facts|
-      {
+    context "on #{os}" do
-        :osfamily => 'Debian',
+      let (:facts) do
-      }
+        facts.merge!(OSDefaults.get_facts())
       end
 
-    it_configures 'ceph key'
+      it_behaves_like 'ceph key'
     end
-
-  describe 'RedHat Family' do
-
-    let :facts do
-      {
-        :osfamily => 'RedHat',
-      }
-    end
-
-    it_configures 'ceph key'
   end
 end
 

spec/defines/ceph_osd_spec.rb

@@ -235,25 +235,16 @@ fi
     end
   end
 
-  context 'Debian Family' do
+  on_supported_os({
-    let :facts do
+    :supported_os => OSDefaults.get_supported_os
-      {
+  }).each do |os,facts|
-        :osfamily => 'Debian',
+    context "on #{os}" do
-      }
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts())
       end
 
-    it_configures 'ceph osd'
+      it_behaves_like 'ceph osd'
     end
-
-  context 'RedHat Family' do
-
-    let :facts do
-      {
-        :osfamily => 'RedHat',
-      }
-    end
-
-    it_configures 'ceph osd'
   end
 end
 

spec/defines/ceph_pool_spec.rb

@@ -76,26 +76,16 @@ describe 'ceph::pool' do
     end
   end
 
-  describe 'Debian Family' do
+  on_supported_os({
-
+    :supported_os => OSDefaults.get_supported_os
-    let :facts do
+  }).each do |os,facts|
-      {
+    context "on #{os}" do
-        :osfamily => 'Debian',
+      let (:facts) do
-      }
+        facts.merge!(OSDefaults.get_facts())
       end
 
-    it_configures 'ceph pool'
+      it_behaves_like 'ceph pool'
     end
-
-  describe 'RedHat Family' do
-
-    let :facts do
-      {
-        :osfamily => 'RedHat',
-      }
-    end
-
-    it_configures 'ceph pool'
   end
 end
 

spec/defines/ceph_rgw_civetweb_spec.rb

@@ -34,7 +34,7 @@ describe 'ceph::rgw' do
         :frontend_type => 'civetweb',
       }
       end
-      it { is_expected.to contain_ceph_config('client.radosgw.civetweb/user').with_value("#{default_params[:user]}") }
+      it { is_expected.to contain_ceph_config('client.radosgw.civetweb/user').with_value("#{platform_params[:user]}") }
       it { is_expected.to contain_ceph_config('client.radosgw.civetweb/host').with_value('myhost') }
       it { is_expected.to contain_ceph_config('client.radosgw.civetweb/keyring').with_value('/etc/ceph/ceph.client.radosgw.civetweb.keyring') }
       it { is_expected.to contain_ceph_config('client.radosgw.civetweb/log_file').with_value('/var/log/ceph/radosgw.log') }
@@ -61,51 +61,35 @@ describe 'ceph::rgw' do
 
   end
 
-  describe 'Debian Family' do
+  on_supported_os({
-
+    :supported_os => OSDefaults.get_supported_os
-    let :facts do
+  }).each do |os,facts|
-      {
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts({
           :concat_basedir         => '/var/lib/puppet/concat',
           :fqdn                   => 'myhost.domain',
           :hostname               => 'myhost',
-        :osfamily               => 'Debian',
+        }))
-        :operatingsystem        => 'Ubuntu',
-        :operatingsystemrelease => '14.04',
-      }
       end
 
-    let :default_params do
+      let :platform_params do
+        case facts[:osfamily]
+        when 'Debian'
           {
             :pkg_radosgw => 'radosgw',
             :user        => 'www-data',
           }
-    end
+        when 'RedHat'
-
-    it_configures 'ceph rgw civetweb'
-  end
-
-  describe 'RedHat Family' do
-
-    let :facts do
-      {
-        :concat_basedir            => '/var/lib/puppet/concat',
-        :fqdn                      => 'myhost.domain',
-        :hostname                  => 'myhost',
-        :osfamily                  => 'RedHat',
-        :operatingsystem           => 'RedHat',
-        :operatingsystemrelease    => '7.2',
-        :operatingsystemmajrelease => '7',
-      }
-    end
-
-    let :default_params do
           {
             :pkg_radosgw => 'ceph-radosgw',
             :user        => 'apache',
           }
         end
+      end
 
-    it_configures 'ceph rgw civetweb'
+      it_behaves_like 'ceph rgw civetweb'
+    end
   end
 
 end