Install python3-keystoneclient in Fedora or RedHat > 7
Fedora repo [1] has python3 packages, start consuming those. [1] http://trunk.rdoproject.org/fedora/puppet-passed-ci/ Change-Id: Id15a40384286a825f65658bdb1ad924a917d9031
This commit is contained in:
parent
9a125b9766
commit
898ecc11f0
|
@ -3,7 +3,8 @@
|
|||
#
|
||||
class keystone::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 = ''
|
||||
|
|
|
@ -3,7 +3,10 @@ require 'spec_helper'
|
|||
describe 'keystone::client' do
|
||||
|
||||
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 "with default parameters" do
|
||||
|
|
|
@ -10,7 +10,10 @@ describe 'keystone::db::mysql' 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
|
||||
|
||||
let :params do
|
||||
|
|
|
@ -2,7 +2,10 @@ require 'spec_helper'
|
|||
|
||||
describe 'keystone::disable_admin_token_auth' do
|
||||
let :facts do
|
||||
@default_facts.merge(:osfamily => 'Debian')
|
||||
@default_facts.merge({
|
||||
:osfamily => 'Debian',
|
||||
:os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
|
||||
})
|
||||
end
|
||||
|
||||
let :pre_condition do
|
||||
|
|
|
@ -14,6 +14,7 @@ describe 'keystone' do
|
|||
:osfamily => 'Debian',
|
||||
:operatingsystem => 'Debian',
|
||||
:operatingsystemrelease => '7.0',
|
||||
:os => { :name => 'Debian', :family => 'Debian', :release => { :major => '7', :minor => '0' } },
|
||||
}))
|
||||
end
|
||||
|
||||
|
@ -1189,7 +1190,8 @@ describe 'keystone' do
|
|||
@default_facts.merge(global_facts.merge({
|
||||
:osfamily => 'RedHat',
|
||||
:operatingsystem => 'RedHat',
|
||||
:operatingsystemrelease => '7.0'
|
||||
:operatingsystemrelease => '7.0',
|
||||
:os => { :name => 'RedHat', :family => 'RedHat', :release => { :major => '7', :minor => '0' } },
|
||||
}))
|
||||
end
|
||||
|
||||
|
@ -1209,7 +1211,8 @@ describe 'keystone' do
|
|||
@default_facts.merge(global_facts.merge({
|
||||
:osfamily => 'Debian',
|
||||
:operatingsystem => 'Debian',
|
||||
:operatingsystemrelease => '7.0'
|
||||
:operatingsystemrelease => '7.0',
|
||||
:os => { :name => 'Debian', :family => 'Debian', :release => { :major => '7', :minor => '0' } },
|
||||
}))
|
||||
end
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@ describe 'keystone::roles::admin' do
|
|||
:operatingsystem => 'Debian',
|
||||
:operatingsystemrelease => '7.0',
|
||||
:os_workers => 1,
|
||||
:os => { :name => 'Debian', :family => 'Debian', :release => { :major => '7', :minor => '0' } },
|
||||
})
|
||||
end
|
||||
|
||||
|
|
|
@ -3,7 +3,10 @@ require 'spec_helper'
|
|||
describe 'keystone::service' do
|
||||
|
||||
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 "with default parameters" do
|
||||
|
|
Loading…
Reference in New Issue