Merge "Update cinder packages name for Fedora and RedHat > 7"

manifests/params.pp

@@ -5,7 +5,8 @@
 class cinder::params {
   include ::openstacklib::defaults
 
-  if ($::os_package_type == 'debian') {
+  if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
+     ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
     $pyvers = '3'
   } else {
     $pyvers = ''

spec/classes/cinder_init_spec.rb

@@ -13,6 +13,7 @@ describe 'cinder' do
       :osfamily               => 'Debian',
       :operatingsystem        => 'Debian',
       :operatingsystemrelease => 'jessie',
+      :os                     => { :name  => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
     })
   end
 

spec/classes/cinder_scheduler_spec.rb

@@ -5,7 +5,10 @@ describe 'cinder::scheduler' do
   describe 'on debian platforms' do
 
     let :facts do
-      OSDefaults.get_facts({ :osfamily => 'Debian' })
+      OSDefaults.get_facts({
+	:osfamily => 'Debian',
+	:os       => { :name  => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
+      })
     end
 
     describe 'with default parameters' do
@@ -55,7 +58,10 @@ describe 'cinder::scheduler' do
   describe 'on rhel platforms' do
 
     let :facts do
-      OSDefaults.get_facts({ :osfamily => 'RedHat' })
+      OSDefaults.get_facts({
+        :osfamily => 'RedHat',
+        :os       => { :name  => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } },
+      })
     end
 
     describe 'with default parameters' do

spec/classes/cinder_volume_spec.rb

@@ -7,7 +7,10 @@ describe 'cinder::volume' do
   end
 
   let :facts do
-    OSDefaults.get_facts({:osfamily => 'Debian'})
+    OSDefaults.get_facts({
+      :osfamily => 'Debian',
+      :os       => { :name  => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
+    })
   end
 
   it { is_expected.to contain_package('cinder-volume').with_ensure('present') }

spec/defines/cinder_backend_emc_vnx_spec.rb

@@ -13,7 +13,10 @@ describe 'cinder::backend::emc_vnx' do
   end
 
   let :facts do
-    OSDefaults.get_facts({:osfamily => 'Redhat' })
+    OSDefaults.get_facts({
+      :osfamily => 'Redhat',
+      :os       => { :name  => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } },
+    })
   end
 
   let :params do

spec/defines/cinder_backend_iscsi_spec.rb

@@ -11,7 +11,10 @@ describe 'cinder::backend::iscsi' do
   end
 
   let :facts do
-    OSDefaults.get_facts({:osfamily => 'Debian'})
+    OSDefaults.get_facts({
+      :osfamily => 'Debian',
+      :os       => { :name  => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
+    })
   end
 
   let :params do
@@ -93,7 +96,10 @@ describe 'cinder::backend::iscsi' do
   describe 'with RedHat' do
 
     let :facts do
-      OSDefaults.get_facts({:osfamily => 'RedHat'})
+      OSDefaults.get_facts({
+        :osfamily => 'RedHat',
+        :os       => { :name  => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } },
+      })
     end
 
     it { is_expected.to contain_file_line('cinder include').with(

spec/defines/cinder_backend_nvmeof_spec.rb

@@ -13,7 +13,10 @@ describe 'cinder::backend::nvmeof' do
   end
 
   let :facts do
-    OSDefaults.get_facts({:osfamily => 'Debian'})
+    OSDefaults.get_facts({
+      :osfamily => 'Debian',
+      :os       => { :name  => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
+    })
   end
 
   let :params do

spec/defines/cinder_backend_rbd_spec.rb

@@ -31,7 +31,10 @@ describe 'cinder::backend::rbd' do
   end
 
   let :facts do
-    @default_facts.merge({:osfamily => 'Debian'})
+    @default_facts.merge({
+       :osfamily => 'Debian',
+       :os       => { :name  => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
+    })
   end
 
   describe 'rbd backend volume driver' do
@@ -109,7 +112,10 @@ describe 'cinder::backend::rbd' do
 
   describe 'with RedHat' do
     let :facts do
-        @default_facts.merge({ :osfamily => 'RedHat' })
+        @default_facts.merge({
+           :osfamily => 'RedHat',
+           :os       => { :name  => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } },
+        })
     end
 
     let :params do