Inherit pyvers from openstacklib::defaults

Change-Id: I6fc7d44af02ad6b4568fecdea0428da91e454b43
This commit is contained in:
Tobias Urdin 2019-01-17 21:25:28 +01:00
parent efec52ee24
commit da20139d5d
3 changed files with 4 additions and 14 deletions

View File

@ -4,13 +4,7 @@
#
class designate::params {
include ::openstacklib::defaults
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7){
$pyvers = '3'
} else {
$pyvers = ''
}
$pyvers = $::openstacklib::defaults::pyvers
$state_path = '/var/lib/designate'
$log_dir = '/var/log/designate'
@ -48,7 +42,7 @@ class designate::params {
$central_package_name = 'designate-central'
$agent_package_name = 'designate-agent'
$sink_package_name = 'designate-sink'
$pymysql_package_name = 'python-pymysql'
$pymysql_package_name = "python${pyvers}-pymysql"
$pool_manager_package_name = 'designate-pool-manager'
$mdns_package_name = 'designate-mdns'
$zone_manager_package_name = 'designate-zone-manager'

View File

@ -49,11 +49,7 @@ describe 'designate::client' do
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
if facts[:os_package_type] == 'debian'
{ :client_package_name => 'python3-designateclient' }
else
{ :client_package_name => 'python-designateclient' }
end
{ :client_package_name => 'python3-designateclient' }
when 'RedHat'
{ :client_package_name => 'python-designateclient' }
end

View File

@ -69,7 +69,7 @@ describe 'designate::db' do
it 'install the proper backend package' do
is_expected.to contain_package('designate-backend-package').with(
:ensure => 'present',
:name => 'python-pymysql',
:name => 'python3-pymysql',
:tag => 'openstack'
)
end