From ba65e562b91419bc3f0f40932548c4071d5d68e8 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 1 Apr 2020 07:38:05 +0900 Subject: [PATCH] Expect python3-redis in CentOS8 and Fedora ... because these use python3 instead of python2. Change-Id: Iee4deab3b1e71cd2cf2f2efea061db545e9ee47c --- spec/classes/aodh_evaluator_spec.rb | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/spec/classes/aodh_evaluator_spec.rb b/spec/classes/aodh_evaluator_spec.rb index f9475d3a..eef261d0 100644 --- a/spec/classes/aodh_evaluator_spec.rb +++ b/spec/classes/aodh_evaluator_spec.rb @@ -118,9 +118,21 @@ describe 'aodh::evaluator' do :evaluator_service_name => 'aodh-evaluator', :redis_package_name => 'python3-redis' } when 'RedHat' - { :evaluator_package_name => 'openstack-aodh-evaluator', - :evaluator_service_name => 'openstack-aodh-evaluator', - :redis_package_name => 'python-redis' } + if facts[:operatingsystem] == 'Fedora' + { :evaluator_package_name => 'openstack-aodh-evaluator', + :evaluator_service_name => 'openstack-aodh-evaluator', + :redis_package_name => 'python3-redis' } + else + if facts[:operatingsystemmajrelease] > '7' + { :evaluator_package_name => 'openstack-aodh-evaluator', + :evaluator_service_name => 'openstack-aodh-evaluator', + :redis_package_name => 'python3-redis' } + else + { :evaluator_package_name => 'openstack-aodh-evaluator', + :evaluator_service_name => 'openstack-aodh-evaluator', + :redis_package_name => 'python-redis' } + end + end end end it_configures 'aodh-evaluator'