From 1928f276b8ef2f4e6cdab6548e067279ba554f90 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 26 Nov 2018 13:23:55 -0700 Subject: [PATCH] Update python packaging version for RHEL8 The glanceclient is python3-glanceclient for RHEL8 Change-Id: Id7fffe8e97a252619e5494e3c0baa61006049234 --- manifests/params.pp | 3 ++- spec/classes/glance_api_spec.rb | 2 +- spec/classes/glance_registry_spec.rb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 36ae5e2d..141db11e 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -3,7 +3,8 @@ class glance::params { include ::openstacklib::defaults - if ($::os_package_type == 'debian') or ($::operatingsystem == 'Fedora') { + if ($::os_package_type == 'debian') or ($::operatingsystem == 'Fedora') or + ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) { $pyvers = '3' } else { $pyvers = '' diff --git a/spec/classes/glance_api_spec.rb b/spec/classes/glance_api_spec.rb index 2dd2047c..3cf3a0ab 100644 --- a/spec/classes/glance_api_spec.rb +++ b/spec/classes/glance_api_spec.rb @@ -457,7 +457,7 @@ describe 'glance::api' do describe 'on unknown platforms' do let :facts do - OSDefaults.get_facts({ :osfamily => 'unknown' }) + OSDefaults.get_facts({ :osfamily => 'unknown', :os => { :family => 'unknown', :release => { :major => '1'}}}) end let(:params) { default_params } diff --git a/spec/classes/glance_registry_spec.rb b/spec/classes/glance_registry_spec.rb index a79fada8..584f4b10 100644 --- a/spec/classes/glance_registry_spec.rb +++ b/spec/classes/glance_registry_spec.rb @@ -212,7 +212,7 @@ describe 'glance::registry' do describe 'on unknown platforms' do let :facts do - OSDefaults.get_facts({ :osfamily => 'unknown' }) + OSDefaults.get_facts({ :osfamily => 'unknown', :os => { :family => 'unknown', :release => { :major => '1'}}}) end let(:params) { default_params }