From 122498f1bf11d907dbceb475a2dc9dac011b8c9b Mon Sep 17 00:00:00 2001 From: Xing Zhou Date: Fri, 25 Nov 2016 12:41:37 +0800 Subject: [PATCH] Fix default murano client package name error for RedHat platforms when install murano client package in RedHat platforms, the default murano client package name: openstack-python-muranoclient is not found. so the client package name should be changed to python-muranoclient. Change-Id: Ib57998280762f9d6a9cf615bd0d5b3f558a39258 Closes-Bug: #1644699 --- manifests/params.pp | 2 +- ...ix_client_package_name-897d4c0a7c9a7cbf.yaml | 6 ++++++ spec/classes/murano_client_spec.rb | 17 +++++++++-------- 3 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 releasenotes/notes/fix_client_package_name-897d4c0a7c9a7cbf.yaml diff --git a/manifests/params.pp b/manifests/params.pp index da0f88d..762b4e6 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -19,7 +19,7 @@ class murano::params { $cfapi_package_name = 'openstack-murano-cfapi' $common_package_name = 'openstack-murano-common' $engine_package_name = 'openstack-murano-engine' - $pythonclient_package_name = 'openstack-python-muranoclient' + $pythonclient_package_name = 'python-muranoclient' $dashboard_package_name = 'openstack-murano-dashboard' # dashboard config file $local_settings_path = '/etc/openstack-dashboard/local_settings' diff --git a/releasenotes/notes/fix_client_package_name-897d4c0a7c9a7cbf.yaml b/releasenotes/notes/fix_client_package_name-897d4c0a7c9a7cbf.yaml new file mode 100644 index 0000000..d245833 --- /dev/null +++ b/releasenotes/notes/fix_client_package_name-897d4c0a7c9a7cbf.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - Fixes `bug 1644699 + `__ so + we're able to correctly install murano client package in RedHat + platforms. diff --git a/spec/classes/murano_client_spec.rb b/spec/classes/murano_client_spec.rb index 1a35d5f..6cf3caa 100644 --- a/spec/classes/murano_client_spec.rb +++ b/spec/classes/murano_client_spec.rb @@ -9,14 +9,15 @@ describe 'murano::client' do )} end - context 'on Debian platforms' do - let :facts do - OSDefaults.get_facts({ - :osfamily => 'Debian', - :operatingsystem => 'Debian', - }) - end + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| + context "on #{os}" do + let (:facts) do + facts.merge!(OSDefaults.get_facts()) + end - it_configures 'murano-client' + it_configures 'murano-client' + end end end