Fixing default_facts merge

Prior to this change, we were incorrectly using merge! on the
@default_facts. This would eventually lead to weird testing issues if
@default_facts was ever reused within a test run. merge!(...) will
update the @default_facts variable and we want to use merge(...) so that
we are not updating the @default_facts variable.

Change-Id: I55b518ee4af1a76ff5fc0e071410ccee5e4dfb34

spec/classes/cinder_api_spec.rb

@@ -6,7 +6,7 @@ describe 'cinder::api' do
     {:keystone_password => 'foo'}
   end
   let :facts do
-    @default_facts.merge!({
+    @default_facts.merge({
      :osfamily       => 'Debian',
      :processorcount => 8
     })

spec/classes/cinder_backup_nfs_spec.rb

@@ -69,7 +69,7 @@ describe 'cinder::backup::nfs' do
 
   context 'on Debian platforms' do
     let :facts do
-      @default_facts.merge!({:osfamily => 'Debian'})
+      @default_facts.merge({:osfamily => 'Debian'})
     end
 
     it_configures 'cinder backup with nfs'
@@ -77,7 +77,7 @@ describe 'cinder::backup::nfs' do
 
   context 'on RedHat platforms' do
     let :facts do
-      @default_facts.merge!({:osfamily => 'RedHat'})
+      @default_facts.merge({:osfamily => 'RedHat'})
     end
 
     it_configures 'cinder backup with nfs'

spec/classes/cinder_db_spec.rb

@@ -54,7 +54,7 @@ describe 'cinder::db' do
 
   context 'on Debian platforms' do
     let :facts do
-    @default_facts.merge!({
+    @default_facts.merge({
       :osfamily => 'Debian',
       :operatingsystem => 'Debian',
       :operatingsystemrelease => 'jessie',
@@ -66,7 +66,7 @@ describe 'cinder::db' do
 
   context 'on Redhat platforms' do
     let :facts do
-    @default_facts.merge!({
+    @default_facts.merge({
         :osfamily => 'RedHat',
         :operatingsystemrelease => '7.1',
     })

spec/classes/cinder_logging_spec.rb

@@ -111,7 +111,7 @@ describe 'cinder::logging' do
 
   context 'on Debian platforms' do
     let :facts do
-      @default_facts.merge!({ :osfamily => 'Debian' })
+      @default_facts.merge({ :osfamily => 'Debian' })
     end
 
     it_configures 'cinder-logging'
@@ -119,7 +119,7 @@ describe 'cinder::logging' do
 
   context 'on RedHat platforms' do
     let :facts do
-      @default_facts.merge!({ :osfamily => 'RedHat' })
+      @default_facts.merge({ :osfamily => 'RedHat' })
     end
 
     it_configures 'cinder-logging'

spec/classes/cinder_scheduler_spec.rb

@@ -5,7 +5,7 @@ describe 'cinder::scheduler' do
   describe 'on debian platforms' do
 
     let :facts do
-      @default_facts.merge!({ :osfamily => 'Debian' })
+      @default_facts.merge({ :osfamily => 'Debian' })
     end
 
     describe 'with default parameters' do

spec/classes/cinder_spec.rb

@@ -9,7 +9,7 @@ describe 'cinder' do
   end
 
   let :facts do
-    @default_facts.merge!({
+    @default_facts.merge({
       :osfamily => 'Debian',
       :operatingsystem => 'Debian',
       :operatingsystemrelease => 'jessie',

spec/classes/cinder_volume_netapp_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'cinder::volume::netapp' do
 
   let :facts do
-    @default_facts.merge!({})
+    @default_facts.merge({})
   end
 
   let :params do

spec/classes/cinder_volume_spec.rb

@@ -7,7 +7,7 @@ describe 'cinder::volume' do
   end
 
   let :facts do
-    @default_facts.merge!({:osfamily => 'Debian'})
+    @default_facts.merge({:osfamily => 'Debian'})
   end
 
   it { is_expected.to contain_package('cinder-volume').with_ensure('present') }

spec/defines/cinder_backend_netapp_spec.rb

@@ -5,7 +5,7 @@ describe 'cinder::backend::netapp' do
   let(:title) {'netapp'}
 
   let :facts do
-    @default_facts.merge!({})
+    @default_facts.merge({})
   end
 
   let :params do

spec/defines/cinder_backend_rbd_spec.rb

@@ -5,7 +5,7 @@ describe 'cinder::backend::rbd' do
   let(:title) {'rbd-ssd'}
 
   let :facts do
-    @default_facts.merge!({})
+    @default_facts.merge({})
   end
 
   let :req_params do