Add support of os_service_default fact in glance spec

This change adds possibility to use the os_service_default
   fact for configuration options that default to '<SERVICE DEFAULT>'.
   this change is done by analogy with cinder
   commit 667e6c0850672dbbf99381eb92468f95e5591913

Change-Id: Ie5c8909bcc1c9a6a7a9ab1b59eec4637751ffd74

spec/classes/glance_api_logging_spec.rb

@@ -129,7 +129,9 @@ describe 'glance::api::logging' do
 
   context 'on Debian platforms' do
     let :facts do
-      { :osfamily => 'Debian' }
+      @default_facts.merge({
+        :osfamily       => 'Debian',
+      })
     end
 
     it_configures 'glance-api-logging'
@@ -137,7 +139,9 @@ describe 'glance::api::logging' do
 
   context 'on RedHat platforms' do
     let :facts do
-      { :osfamily => 'RedHat' }
+      @default_facts.merge({
+        :osfamily => 'RedHat',
+      })
     end
 
     it_configures 'glance-api-logging'

spec/classes/glance_api_spec.rb

@@ -3,10 +3,10 @@ require 'spec_helper'
 describe 'glance::api' do
 
   let :facts do
-    {
-      :osfamily => 'Debian',
-      :processorcount => '7',
-    }
+    @default_facts.merge({
+     :osfamily       => 'Debian',
+     :processorcount => '7',
+    })
   end
 
   let :default_params do
@@ -377,7 +377,9 @@ describe 'glance::api' do
 
   describe 'on Debian platforms' do
     let :facts do
-      { :osfamily => 'Debian' }
+      @default_facts.merge({
+        :osfamily       => 'Debian',
+      })
     end
     let(:params) { default_params }
 
@@ -396,7 +398,9 @@ describe 'glance::api' do
 
   describe 'on RedHat platforms' do
     let :facts do
-      { :osfamily => 'RedHat' }
+      @default_facts.merge({
+        :osfamily       => 'RedHat',
+      })
     end
     let(:params) { default_params }
 

spec/classes/glance_backend_cinder_spec.rb

@@ -78,7 +78,9 @@ describe 'glance::backend::cinder' do
 
   context 'on Debian platforms' do
     let :facts do
-      { :osfamily => 'Debian' }
+      @default_facts.merge({
+        :osfamily       => 'Debian',
+      })
     end
 
     it_configures 'glance with cinder backend'
@@ -86,7 +88,9 @@ describe 'glance::backend::cinder' do
 
   context 'on RedHat platforms' do
     let :facts do
-      { :osfamily => 'RedHat' }
+      @default_facts.merge({
+        :osfamily => 'RedHat',
+      })
     end
 
     it_configures 'glance with cinder backend'

spec/classes/glance_backend_file_spec.rb

@@ -2,7 +2,9 @@ require 'spec_helper'
 
 describe 'glance::backend::file' do
   let :facts do
-    { :osfamily => 'Debian' }
+      @default_facts.merge({
+        :osfamily       => 'Debian',
+      })
   end
 
   it 'configures glance-api.conf' do

spec/classes/glance_backend_rbd_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe 'glance::backend::rbd' do
   let :facts do
-    {
-      :osfamily => 'Debian'
-    }
+      @default_facts.merge({
+        :osfamily       => 'Debian',
+      })
   end
 
   describe 'when defaults with rbd_store_user' do
@@ -48,10 +48,10 @@ describe 'glance::backend::rbd' do
 
   describe 'package on RedHat platform el6' do
     let :facts do
-      {
+      @default_facts.merge({
         :osfamily               => 'RedHat',
         :operatingsystemrelease => '6.5',
-      }
+      })
     end
     it { is_expected.to contain_package('python-ceph').with(
         :name   => 'python-ceph',
@@ -61,10 +61,10 @@ describe 'glance::backend::rbd' do
   end
   describe 'package on RedHat platform el7' do
     let :facts do
-      {
+      @default_facts.merge({
         :osfamily               => 'RedHat',
         :operatingsystemrelease => '7.0'
-      }
+      })
     end
     it { is_expected.to contain_package('python-ceph').with(
         :name   => 'python-rbd',

spec/classes/glance_backend_s3_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe 'glance::backend::s3' do
   let :facts do
-    {
-      :osfamily => 'Debian'
-    }
+    @default_facts.merge({
+        :osfamily       => 'Debian',
+    })
   end
 
   let :params do

spec/classes/glance_backend_swift_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe 'glance::backend::swift' do
   let :facts do
-    {
-      :osfamily => 'Debian'
-    }
+    @default_facts.merge({
+      :osfamily       => 'Debian',
+    })
   end
 
   let :params do

spec/classes/glance_backend_vsphere_spec.rb

@@ -78,7 +78,9 @@ describe 'glance::backend::vsphere' do
 
   context 'on Debian platforms' do
     let :facts do
-      { :osfamily => 'Debian' }
+      @default_facts.merge({
+        :osfamily       => 'Debian',
+      })
     end
 
     it_configures 'glance with vsphere backend'
@@ -86,7 +88,9 @@ describe 'glance::backend::vsphere' do
 
   context 'on RedHat platforms' do
     let :facts do
-      { :osfamily => 'RedHat' }
+      @default_facts.merge({
+        :osfamily => 'RedHat',
+      })
     end
 
     it_configures 'glance with vsphere backend'

spec/classes/glance_cache_cleaner_spec.rb

@@ -48,7 +48,9 @@ describe 'glance::cache::cleaner' do
 
   context 'on Debian platforms' do
     let :facts do
-      { :osfamily => 'Debian' }
+      @default_facts.merge({
+        :osfamily       => 'Debian',
+      })
     end
     include_examples 'glance cache cleaner'
     it { is_expected.to contain_cron('glance-cache-cleaner').with(:require     => 'Package[glance-api]')}
@@ -56,7 +58,9 @@ describe 'glance::cache::cleaner' do
 
   context 'on RedHat platforms' do
     let :facts do
-      { :osfamily => 'RedHat' }
+      @default_facts.merge({
+        :osfamily => 'RedHat',
+      })
     end
     include_examples 'glance cache cleaner'
     it { is_expected.to contain_cron('glance-cache-cleaner').with(:require     => 'Package[openstack-glance]')}

spec/classes/glance_cache_pruner_spec.rb

@@ -48,7 +48,9 @@ describe 'glance::cache::pruner' do
 
   context 'on Debian platforms' do
     let :facts do
-      { :osfamily => 'Debian' }
+      @default_facts.merge({
+        :osfamily       => 'Debian',
+      })
     end
     include_examples 'glance cache pruner'
     it { is_expected.to contain_cron('glance-cache-pruner').with(:require     => 'Package[glance-api]')}
@@ -56,7 +58,9 @@ describe 'glance::cache::pruner' do
 
   context 'on RedHat platforms' do
     let :facts do
-      { :osfamily => 'RedHat' }
+      @default_facts.merge({
+        :osfamily => 'RedHat',
+      })
     end
     include_examples 'glance cache pruner'
     it { is_expected.to contain_cron('glance-cache-pruner').with(:require     => 'Package[openstack-glance]')}

spec/classes/glance_client_spec.rb

@@ -14,14 +14,18 @@ describe 'glance::client' do
 
   context 'on Debian platforms' do
     let :facts do
-      { :osfamily => 'Debian' }
+      @default_facts.merge({
+        :osfamily       => 'Debian',
+      })
     end
     include_examples 'glance client'
   end
 
   context 'on RedHat platforms' do
     let :facts do
-      { :osfamily => 'RedHat' }
+      @default_facts.merge({
+        :osfamily => 'RedHat',
+      })
     end
     include_examples 'glance client'
   end

spec/classes/glance_db_mysql_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe 'glance::db::mysql' do
   let :facts do
-    {
-      :osfamily => 'Debian'
-    }
+    @default_facts.merge({
+      :osfamily       => 'Debian',
+    })
   end
 
   let :pre_condition do

spec/classes/glance_db_postgresql_spec.rb

@@ -12,11 +12,11 @@ describe 'glance::db::postgresql' do
 
   context 'on a RedHat osfamily' do
     let :facts do
-      {
+      @default_facts.merge({
         :osfamily                 => 'RedHat',
         :operatingsystemrelease   => '7.0',
         :concat_basedir => '/var/lib/puppet/concat'
-      }
+      })
     end
 
     context 'with only required parameters' do
@@ -34,12 +34,12 @@ describe 'glance::db::postgresql' do
 
   context 'on a Debian osfamily' do
     let :facts do
-      {
+      @default_facts.merge({
         :operatingsystemrelease => '7.8',
         :operatingsystem        => 'Debian',
         :osfamily               => 'Debian',
         :concat_basedir => '/var/lib/puppet/concat'
-      }
+      })
     end
 
     context 'with only required parameters' do

spec/classes/glance_db_sync_spec.rb

@@ -36,11 +36,11 @@ describe 'glance::db::sync' do
 
   context 'on a RedHat osfamily' do
     let :facts do
-      {
+      @default_facts.merge({
         :osfamily                 => 'RedHat',
         :operatingsystemrelease   => '7.0',
         :concat_basedir => '/var/lib/puppet/concat'
-      }
+      })
     end
 
     it_configures 'glance-dbsync'
@@ -48,12 +48,12 @@ describe 'glance::db::sync' do
 
   context 'on a Debian osfamily' do
     let :facts do
-      {
+      @default_facts.merge({
         :operatingsystemrelease => '7.8',
         :operatingsystem        => 'Debian',
         :osfamily               => 'Debian',
         :concat_basedir => '/var/lib/puppet/concat'
-      }
+      })
     end
 
     it_configures 'glance-dbsync'

spec/classes/glance_keystone_auth_spec.rb

@@ -160,7 +160,9 @@ describe 'glance::keystone::auth' do
     end
 
     let :facts do
-      { :osfamily => 'Debian' }
+      @default_facts.merge({
+        :osfamily       => 'Debian',
+      })
     end
 
     let :params do

spec/classes/glance_notify_qpid_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 describe 'glance::notify::qpid' do
   let :facts do
-    {
-      :osfamily => 'Debian'
-    }
+    @default_facts.merge({
+      :osfamily       => 'Debian',
+    })
   end
 
   let :pre_condition do

spec/classes/glance_notify_rabbitmq_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 describe 'glance::notify::rabbitmq' do
   let :facts do
-    {
-      :osfamily => 'Debian'
-    }
+    @default_facts.merge({
+     :osfamily       => 'Debian',
+    })
   end
 
   let :pre_condition do

spec/classes/glance_policy_spec.rb

@@ -25,7 +25,9 @@ describe 'glance::policy' do
 
   context 'on Debian platforms' do
     let :facts do
-      { :osfamily => 'Debian' }
+      @default_facts.merge({
+        :osfamily       => 'Debian',
+      })
     end
 
     it_configures 'glance policies'
@@ -33,7 +35,9 @@ describe 'glance::policy' do
 
   context 'on RedHat platforms' do
     let :facts do
-      { :osfamily => 'RedHat' }
+      @default_facts.merge({
+        :osfamily => 'RedHat',
+      })
     end
 
     it_configures 'glance policies'

spec/classes/glance_registry_logging_spec.rb

@@ -129,7 +129,9 @@ describe 'glance::registry::logging' do
 
   context 'on Debian platforms' do
     let :facts do
-      { :osfamily => 'Debian' }
+      @default_facts.merge({
+        :osfamily       => 'Debian',
+      })
     end
 
     it_configures 'glance-registry-logging'
@@ -137,7 +139,9 @@ describe 'glance::registry::logging' do
 
   context 'on RedHat platforms' do
     let :facts do
-      { :osfamily => 'RedHat' }
+      @default_facts.merge({
+        :osfamily => 'RedHat',
+      })
     end
 
     it_configures 'glance-registry-logging'

spec/classes/glance_registry_spec.rb

@@ -2,10 +2,10 @@
 describe 'glance::registry' do
 
   let :facts do
-    {
-      :osfamily       => 'Debian',
-      :processorcount => '7',
-    }
+    @default_facts.merge({
+     :osfamily       => 'Debian',
+     :processorcount => '7',
+    })
   end
 
   let :default_params do
@@ -273,7 +273,9 @@ describe 'glance::registry' do
 
   describe 'on Debian platforms' do
     let :facts do
-      { :osfamily => 'Debian' }
+      @default_facts.merge({
+        :osfamily       => 'Debian',
+      })
     end
 
     # We only test this on Debian platforms, since on RedHat there isn't a
@@ -291,7 +293,9 @@ describe 'glance::registry' do
 
   describe 'on RedHat platforms' do
     let :facts do
-      { :osfamily => 'RedHat' }
+      @default_facts.merge({
+        :osfamily       => 'RedHat',
+      })
     end
     let(:params) { default_params }
 

spec/classes/glance_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe 'glance' do
 
   let :facts do
-    {
-      :osfamily => 'Debian'
-    }
+    @default_facts.merge({
+        :osfamily       => 'Debian',
+    })
   end
 
   let :default_params do
@@ -40,7 +40,9 @@ describe 'glance' do
 
   describe 'on Debian platforms' do
     let :facts do
-      { :osfamily => 'Debian' }
+      @default_facts.merge({
+        :osfamily       => 'Debian',
+      })
     end
     let(:params) { default_params }
 
@@ -49,7 +51,9 @@ describe 'glance' do
 
   describe 'on RedHat platforms' do
     let :facts do
-      { :osfamily => 'RedHat' }
+      @default_facts.merge({
+        :osfamily => 'RedHat',
+      })
     end
     let(:params) { default_params }
 

spec/spec_helper.rb

@@ -7,6 +7,9 @@ require 'webmock/rspec'
 RSpec.configure do |c|
   c.alias_it_should_behave_like_to :it_configures, 'configures'
   c.alias_it_should_behave_like_to :it_raises, 'raises'
+  c.before :each do
+    @default_facts = { :os_service_default => '<SERVICE DEFAULT>' }
+  end
 end
 
 at_exit { RSpec::Puppet::Coverage.report! }