Merge "Update python packaging version for RHEL8"

This commit is contained in:
Zuul 2018-12-03 19:03:46 +00:00 committed by Gerrit Code Review
commit 402c369d28
3 changed files with 4 additions and 3 deletions

View File

@ -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 = ''

View File

@ -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 }

View File

@ -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 }