Merge "Update python packaging version for RHEL8"
This commit is contained in:
commit
402c369d28
|
@ -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 = ''
|
||||
|
|
|
@ -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 }
|
||||
|
||||
|
|
|
@ -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 }
|
||||
|
||||
|
|
Loading…
Reference in New Issue