Expect python3 package in CentOS8 and Fedora

In CentOS 8.x and Fedora, we expect to have python3 package, while we
expect to have python2 in 7.x .
Fix unit tests to expect the correct version according to os major
version.

Change-Id: I298706690ee73db76678653841514de120c61e27
This commit is contained in:
Takashi Kajinami 2020-04-10 00:38:11 +09:00
parent 0585062ab2
commit faaaa4a773

View File

@ -765,12 +765,30 @@ describe 'horizon' do
}
end
when 'RedHat'
{ :config_file => '/etc/openstack-dashboard/local_settings',
:package_name => 'openstack-dashboard',
:root_url => '/dashboard',
:root_path => '/usr/share/openstack-dashboard',
:memcache_package => 'python-memcached',
}
if facts[:operatingsystem] == 'Fedora'
{ :config_file => '/etc/openstack-dashboard/local_settings',
:package_name => 'openstack-dashboard',
:root_url => '/dashboard',
:root_path => '/usr/share/openstack-dashboard',
:memcache_package => 'python3-memcached',
}
else
if facts[:operatingsystemmajrelease] > '7'
{ :config_file => '/etc/openstack-dashboard/local_settings',
:package_name => 'openstack-dashboard',
:root_url => '/dashboard',
:root_path => '/usr/share/openstack-dashboard',
:memcache_package => 'python3-memcached',
}
else
{ :config_file => '/etc/openstack-dashboard/local_settings',
:package_name => 'openstack-dashboard',
:root_url => '/dashboard',
:root_path => '/usr/share/openstack-dashboard',
:memcache_package => 'python-memcached',
}
end
end
end
end