Fix unit tests against Puppet 4.3.0

Change-Id: Ib79cd22ff71d05c20bc5103e21bda37a84723406
Related-bug: #1517805

spec/classes/neutron_agents_dhcp_spec.rb

@@ -180,7 +180,10 @@ describe 'neutron::agents::dhcp' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     let :platform_params do

spec/classes/neutron_agents_l3_spec.rb

@@ -158,7 +158,10 @@ describe 'neutron::agents::l3' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     let :platform_params do

spec/classes/neutron_agents_lbaas_spec.rb

@@ -134,8 +134,9 @@ describe 'neutron::agents::lbaas' do
   context 'on RedHat platforms' do
     let :facts do
       default_facts.merge(
-        { :osfamily => 'RedHat',
-          :concat_basedir => '/dne'
+        { :osfamily               => 'RedHat',
+          :operatingsystemrelease => '7',
+          :concat_basedir         => '/dne'
         }
       )
     end

spec/classes/neutron_agents_metadata_spec.rb

@@ -119,9 +119,10 @@ describe 'neutron::agents::metadata' do
 
   context 'on Red Hat platforms' do
     let :facts do
-      default_facts.merge(
-        { :osfamily => 'RedHat' }
-      )
+      default_facts.merge({
+        :osfamily => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     let :platform_params do

spec/classes/neutron_agents_metering_spec.rb

@@ -133,7 +133,10 @@ describe 'neutron::agents::metering' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     let :platform_params do

spec/classes/neutron_agents_ml2_linuxbridge_spec.rb

@@ -162,7 +162,10 @@ describe 'neutron::agents::ml2::linuxbridge' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     let :platform_params do

spec/classes/neutron_agents_ml2_ovs_spec.rb

@@ -250,7 +250,10 @@ describe 'neutron::agents::ml2::ovs' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     let :platform_params do

spec/classes/neutron_agents_ml2_sriov_spec.rb

@@ -99,7 +99,10 @@ describe 'neutron::agents::ml2::sriov' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     let :platform_params do

spec/classes/neutron_client_spec.rb

@@ -18,7 +18,10 @@ describe 'neutron::client' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     it { is_expected.to contain_class('neutron::client') }

spec/classes/neutron_db_spec.rb

@@ -65,7 +65,7 @@ describe 'neutron::db' do
 
   context 'on Redhat platforms' do
     let :facts do
-      { :osfamily => 'RedHat',
+      { :osfamily               => 'RedHat',
         :operatingsystemrelease => '7.1',
       }
     end

spec/classes/neutron_init_spec.rb

@@ -514,7 +514,10 @@ describe 'neutron' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     let :platform_params do

spec/classes/neutron_plugins_cisco_spec.rb

@@ -168,7 +168,10 @@ describe 'neutron::plugins::cisco' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     it_configures 'default cisco plugin'

spec/classes/neutron_plugins_midonet_spec.rb

@@ -69,7 +69,10 @@ describe 'neutron::plugins::midonet' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat'})
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
     it_configures 'neutron midonet plugin'
   end

spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb

@@ -70,7 +70,10 @@ describe 'neutron::plugins::ml2::bigswitch::restproxy' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({:osfamily => 'RedHat'})
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     it_configures 'neutron bigswitch ml2 restproxy'

spec/classes/neutron_plugins_ml2_bigswitch_spec.rb

@@ -44,7 +44,10 @@ describe 'neutron::plugins::ml2::bigswitch' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({:osfamily => 'RedHat'})
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     it_configures 'neutron plugin bigswitch ml2'

spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb

@@ -89,7 +89,10 @@ describe 'neutron::plugins::ml2::cisco::nexus' do
   begin
     context 'on RedHat platforms' do
       let :facts do
-        default_facts.merge({:osfamily => 'RedHat'})
+        default_facts.merge({
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '7'
+        })
       end
 
       let :platform_params do

spec/classes/neutron_plugins_ml2_cisco_spec.rb

@@ -46,7 +46,10 @@ describe 'neutron::plugins::ml2::cisco' do
   begin
     context 'on RedHat platforms' do
       let :facts do
-        default_facts.merge({:osfamily => 'RedHat'})
+        default_facts.merge({
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '7'
+        })
       end
 
       it_configures 'neutron plugin cisco ml2'

spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb

@@ -49,7 +49,10 @@ describe 'neutron::plugins::ml2::cisco::type_nexus_vxlan' do
   begin
     context 'on RedHat platforms' do
       let :facts do
-        default_facts.merge({:osfamily => 'RedHat'})
+        default_facts.merge({
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '7'
+        })
       end
 
       it_configures 'neutron cisco ml2 type nexus vxlan plugin'

spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb

@@ -55,7 +55,10 @@ describe 'neutron::plugins::ml2::cisco::ucsm' do
   begin
     context 'on RedHat platforms' do
       let :facts do
-        default_facts.merge({:osfamily => 'RedHat'})
+        default_facts.merge({
+          :osfamily => 'RedHat',
+          :operatingsystemrelease => '7'
+        })
       end
 
       it_configures 'neutron cisco ml2 ucsm plugin'

spec/classes/neutron_plugins_ml2_spec.rb

@@ -266,7 +266,10 @@ describe 'neutron::plugins::ml2' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     let :platform_params do

spec/classes/neutron_plugins_nuage_spec.rb

@@ -62,7 +62,10 @@ describe 'neutron::plugins::nuage' do
 
     context 'on RedHat platforms' do
       let :facts do
-        default_facts.merge({ :osfamily => 'RedHat'})
+        default_facts.merge({
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '7'
+        })
       end
 
       it_configures 'neutron plugin nuage'
@@ -88,7 +91,10 @@ describe 'neutron::plugins::nuage' do
 
     context 'on RedHat platforms' do
       let :facts do
-        default_facts.merge({ :osfamily => 'RedHat'})
+        default_facts.merge({
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '7'
+        })
       end
 
       it 'should create plugin symbolic link' do

spec/classes/neutron_plugins_nvp_spec.rb

@@ -105,7 +105,10 @@ describe 'neutron::plugins::nvp' do
 
     context 'on RedHat platforms' do
       let :facts do
-        default_facts.merge({:osfamily => 'RedHat'})
+        default_facts.merge({
+          :osfamily               => 'RedHat',
+          :operatingsystemrelease => '7'
+        })
       end
 
       let :platform_params do

spec/classes/neutron_plugins_opencontrail_spec.rb

@@ -73,7 +73,10 @@ describe 'neutron::plugins::opencontrail' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     let :params do

spec/classes/neutron_plugins_plumgrid_spec.rb

@@ -92,7 +92,10 @@ describe 'neutron::plugins::plumgrid' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat'})
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     it 'should create plugin symbolic link' do

spec/classes/neutron_policy_spec.rb

@@ -39,7 +39,10 @@ describe 'neutron::policy' do
 
   context 'on RedHat platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     it_configures 'neutron policies'

spec/classes/neutron_server_notifications_spec.rb

@@ -193,7 +193,10 @@ describe 'neutron::server::notifications' do
 
     context 'on RedHat platforms' do
         let :facts do
-            default_facts.merge({ :osfamily => 'RedHat' })
+            default_facts.merge({
+              :osfamily               => 'RedHat',
+              :operatingsystemrelease => '7'
+            })
         end
 
         let :platform_params do

spec/classes/neutron_server_spec.rb

@@ -234,7 +234,10 @@ describe 'neutron::server' do
 
   describe "with custom keystone auth_uri" do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
     before do
       params.merge!({
@@ -253,7 +256,10 @@ describe 'neutron::server' do
 
   describe "with custom keystone identity_uri" do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
     before do
       params.merge!({
@@ -272,7 +278,10 @@ describe 'neutron::server' do
 
   describe "with custom keystone identity_uri and auth_uri" do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
     before do
       params.merge!({
@@ -292,7 +301,10 @@ describe 'neutron::server' do
 
   describe "with custom auth region" do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
     before do
       params.merge!({
@@ -326,8 +338,10 @@ describe 'neutron::server' do
   context 'on RedHat platforms' do
     let :facts do
       default_facts.merge(
-        { :osfamily => 'RedHat',
-          :processorcount => '2' })
+        { :osfamily               => 'RedHat',
+          :operatingsystemrelease => '7',
+          :processorcount         => '2'
+      })
     end
 
     let :platform_params do

spec/classes/neutron_services_fwaas_spec.rb

@@ -109,7 +109,10 @@ describe 'neutron::services::fwaas' do
 
   context 'on Red Hat platforms' do
     let :facts do
-      default_facts.merge({ :osfamily => 'RedHat' })
+      default_facts.merge({
+        :osfamily               => 'RedHat',
+        :operatingsystemrelease => '7'
+      })
     end
 
     it_configures 'neutron fwaas service plugin'