Finish rspec-puppet-facts update

Since this module was last updated to use rspec-puppet-facts, a few
additional tests were missed. This change updates the last two tests to
use rspec-puppet-facts.

Change-Id: Idd5f80e797574d0e5661e22ec4d631beba0e358e

spec/classes/aodh_db_mysql_spec.rb

@@ -9,17 +9,14 @@ describe 'aodh::db::mysql' do
     ]
   end
 
-  let :facts do
-    { :osfamily => 'Debian' }
-  end
-
   let :params do
     {
       'password'      => 'fooboozoo_default_password',
     }
   end
 
-  describe 'with only required params' do
+  shared_examples_for 'aodh::db::mysql' do
+    context 'with only required params' do
       it { is_expected.to contain_openstacklib__db__mysql('aodh').with(
         'user'          => 'aodh',
         'password_hash' => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
@@ -30,7 +27,7 @@ describe 'aodh::db::mysql' do
       )}
     end
 
-  describe "overriding allowed_hosts param to array" do
+    context "overriding allowed_hosts param to array" do
       let :params do
         {
           :password       => 'aodhpass',
@@ -39,7 +36,7 @@ describe 'aodh::db::mysql' do
       end
 
     end
-  describe "overriding allowed_hosts param to string" do
+    context "overriding allowed_hosts param to string" do
       let :params do
         {
           :password       => 'aodhpass2',
@@ -49,7 +46,7 @@ describe 'aodh::db::mysql' do
 
     end
 
-  describe "overriding allowed_hosts param equals to host param " do
+    context "overriding allowed_hosts param equals to host param " do
       let :params do
         {
           :password       => 'aodhpass2',
@@ -58,5 +55,17 @@ describe 'aodh::db::mysql' do
       end
 
     end
-
+  end
+
+  on_supported_os({
+    :supported_os => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts())
+      end
+
+      it_behaves_like 'aodh::db::mysql'
+    end
+  end
 end

spec/classes/aodh_keystone_auth_spec.rb

@@ -5,12 +5,8 @@
 require 'spec_helper'
 
 describe 'aodh::keystone::auth' do
-
-  let :facts do
-    { :osfamily => 'Debian' }
-  end
-
-  describe 'with default class parameters' do
+  shared_examples_for 'aodh::keystone::auth' do
+    context 'with default class parameters' do
       let :params do
         { :password => 'aodh_password',
           :tenant   => 'foobar' }
@@ -39,7 +35,7 @@ describe 'aodh::keystone::auth' do
       ) }
     end
 
-  describe 'when overriding URL parameters' do
+    context 'when overriding URL parameters' do
       let :params do
         { :password     => 'aodh_password',
           :public_url   => 'https://10.10.10.10:80',
@@ -55,7 +51,7 @@ describe 'aodh::keystone::auth' do
       ) }
     end
 
-  describe 'when overriding auth name' do
+    context 'when overriding auth name' do
       let :params do
         { :password => 'foo',
           :auth_name => 'aodhany' }
@@ -67,7 +63,7 @@ describe 'aodh::keystone::auth' do
       it { is_expected.to contain_keystone_endpoint('RegionOne/aodh::alarming') }
     end
 
-  describe 'when overriding service name' do
+    context 'when overriding service name' do
       let :params do
         { :service_name => 'aodh_service',
           :auth_name    => 'aodh',
@@ -80,7 +76,7 @@ describe 'aodh::keystone::auth' do
       it { is_expected.to contain_keystone_endpoint('RegionOne/aodh_service::alarming') }
     end
 
-  describe 'when disabling user configuration' do
+    context 'when disabling user configuration' do
 
       let :params do
         {
@@ -98,7 +94,7 @@ describe 'aodh::keystone::auth' do
 
     end
 
-  describe 'when disabling user and user role configuration' do
+    context 'when disabling user and user role configuration' do
 
       let :params do
         {
@@ -116,5 +112,17 @@ describe 'aodh::keystone::auth' do
       ) }
 
     end
-
+  end
+
+  on_supported_os({
+    :supported_os => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts())
+      end
+
+      it_behaves_like 'aodh::keystone::auth'
+    end
+  end
 end

spec/spec_helper.rb

@@ -8,11 +8,6 @@ include RspecPuppetFacts
 RSpec.configure do |c|
   c.alias_it_should_behave_like_to :it_configures, 'configures'
   c.alias_it_should_behave_like_to :it_raises, 'raises'
-  # TODO(aschultz): remove this after all tests converted to use OSDefaults
-  # instead of referencing @default_facts
-  c.before :each do
-    @default_facts = OSDefaults.get_facts
-  end
 end
 
 at_exit { RSpec::Puppet::Coverage.report! }