From 4bb15efe836053b872c266855f5e868375e764e5 Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Thu, 8 Feb 2018 15:32:42 +0000 Subject: [PATCH] Define octavia client package for Red Hat family python-octaviaclient is being packaged starting in RHOSP 13, RDO Queens and Fedora 28. Change-Id: Ide01e285bf89e39839f5c6319c2810bad206c114 --- manifests/params.pp | 2 +- ...dd-octavia-client-red-hat-family-4188177cb4ebe503.yaml | 6 ++++++ spec/classes/octavia_client_spec.rb | 8 +------- 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 releasenotes/notes/add-octavia-client-red-hat-family-4188177cb4ebe503.yaml diff --git a/manifests/params.pp b/manifests/params.pp index c0e18d8b..e3cf95fa 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -15,7 +15,7 @@ class octavia::params { $worker_package_name = 'openstack-octavia-worker' $health_manager_package_name = 'openstack-octavia-health-manager' $housekeeping_package_name = 'openstack-octavia-housekeeping' - $client_package_name = undef + $client_package_name = 'python-octaviaclient' } 'Debian': { $common_package_name = 'octavia-common' diff --git a/releasenotes/notes/add-octavia-client-red-hat-family-4188177cb4ebe503.yaml b/releasenotes/notes/add-octavia-client-red-hat-family-4188177cb4ebe503.yaml new file mode 100644 index 00000000..d93024c9 --- /dev/null +++ b/releasenotes/notes/add-octavia-client-red-hat-family-4188177cb4ebe503.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + Defined Octavia client package name for Red Hat family. + python-octaviaclient is being packaged starting in RHOSP 13, + RDO Queens and Fedora 28. diff --git a/spec/classes/octavia_client_spec.rb b/spec/classes/octavia_client_spec.rb index ce22e6b4..3693c3f3 100644 --- a/spec/classes/octavia_client_spec.rb +++ b/spec/classes/octavia_client_spec.rb @@ -28,13 +28,7 @@ describe 'octavia::client' do end on_supported_os({ - :supported_os => - [ - { 'operatingsystem' => 'Ubuntu', - 'operatingsystemrelease' => [ '16.04' ] }, - { 'operatingsystem' => 'Debian', - 'operatingsystemrelease' => [ '8' ] } - ] + :supported_os => OSDefaults.get_supported_os }).each do |os,facts| context "on #{os}" do let (:facts) do