Install python3-mistralclient in Fedora or RedHat > 7

Fedora repo [1] has python3 packages, start consuming those.

[1] http://trunk.rdoproject.org/fedora/puppet-passed-ci/

Also fix client_package name.

Change-Id: I9668cfc992da16ddddf830e7b2f3d7f5c58d8614

manifests/params.pp

@@ -5,13 +5,14 @@
 class mistral::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 = ''
   }
 
-  $client_package      = "python-${pyvers}mistralclient"
+  $client_package      = "python${pyvers}-mistralclient"
   $db_sync_command     = 'mistral-db-manage --config-file=/etc/mistral/mistral.conf upgrade head'
   $db_populate_command = 'mistral-db-manage --config-file=/etc/mistral/mistral.conf populate'
   $group               = 'mistral'

spec/classes/mistral_api_spec.rb

@@ -129,6 +129,7 @@ describe 'mistral::api' do
         :operatingsystemrelease => '8.0',
         :concat_basedir         => '/var/lib/puppet/concat',
         :fqdn                   => 'some.host.tld',
+        :os                     => { :name  => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
       })
     end
 
@@ -147,6 +148,7 @@ describe 'mistral::api' do
         :operatingsystemrelease => '7.1',
         :fqdn                   => 'some.host.tld',
         :concat_basedir         => '/var/lib/puppet/concat',
+        :os                     => { :name  => 'RedHat', :family => 'RedHat', :release => { :major => '7', :minor => '1' } },
       })
     end
 

spec/classes/mistral_db_mysql_spec.rb

@@ -9,7 +9,10 @@ describe 'mistral::db::mysql' 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/classes/mistral_db_spec.rb

@@ -89,7 +89,8 @@ describe 'mistral::db' do
       OSDefaults.get_facts({
         :osfamily => 'Debian',
         :operatingsystem => 'Debian',
-        :operatingsystemrelease => 'jessie'
+        :operatingsystemrelease => 'jessie',
+        :os       => { :name  => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
       })
     end
 
@@ -131,6 +132,7 @@ describe 'mistral::db' do
       OSDefaults.get_facts({
         :osfamily => 'RedHat',
         :operatingsystemrelease => '7.1',
+        :os       => { :name  => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '1' } },
       })
     end
 

spec/classes/mistral_engine_spec.rb

@@ -74,7 +74,10 @@ describe 'mistral::engine' do
 
   context '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
 
     let :platform_params do
@@ -86,7 +89,10 @@ describe 'mistral::engine' do
 
   context 'on RedHat 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
 
     let :platform_params do

spec/classes/mistral_executor_spec.rb

@@ -70,6 +70,7 @@ describe 'mistral::executor' do
     let :facts do
       OSDefaults.get_facts({
         :osfamily        => 'Debian',
+        :os       => { :name  => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
       })
     end
 
@@ -84,6 +85,7 @@ describe 'mistral::executor' do
     let :facts do
       OSDefaults.get_facts({
         :osfamily    => 'Redhat',
+        :os          => { :name  => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } },
       })
     end
 

spec/classes/mistral_init_spec.rb

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

spec/classes/mistral_keystone_auth_spec.rb

@@ -7,7 +7,8 @@ require 'spec_helper'
 describe 'mistral::keystone::auth' do
 
   let :facts do
-    { :osfamily => 'Debian' }
+    { :osfamily => 'Debian',
+      :os       => { :name  => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, }
   end
 
   describe 'with default class parameters' do