openstack/puppet-nova
Code Issues Proposed changes

Optimise the nova client vars defined

Browse Source 
nova client defined twice, it is unnecessary

Change-Id: I93acd7c4cee0657f56358d9f6cba615fbc0b1d63
Closes-Bug: #1792606
This commit is contained in:
zhulingjie
2018-09-13 17:39:25 -04:00
committed by Alex Schultz
parent 3d877926f0
commit 64e22c6271
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/params.pp
View File

@@ -4,16 +4,17 @@
# should be considered to be constant # should be considered to be constant
class nova::params { class nova::params {
include ::openstacklib::defaults include ::openstacklib::defaults
$group = 'nova'
if ($::os_package_type == 'debian') or ($::operatingsystem == 'Fedora') { if ($::os_package_type == 'debian') or ($::operatingsystem == 'Fedora') {
$pyvers = '3' $pyvers = '3'
} else { } else {
$pyvers = '' $pyvers = ''
} }
$client_package = "python${pyvers}-novaclient"
$group = 'nova'
case $::osfamily { case $::osfamily {
'RedHat': { 'RedHat': {
# package names # package names
$client_package = "python${pyvers}-novaclient"
$api_package_name = 'openstack-nova-api' $api_package_name = 'openstack-nova-api'
$placement_package_name = 'openstack-nova-placement-api' $placement_package_name = 'openstack-nova-placement-api'
$cells_package_name = 'openstack-nova-cells' $cells_package_name = 'openstack-nova-cells'
@@ -89,7 +90,6 @@ class nova::params {
} }
'Debian': { 'Debian': {
# package names # package names
$client_package = "python${pyvers}-novaclient"
$api_package_name = 'nova-api' $api_package_name = 'nova-api'
$placement_package_name = 'nova-placement-api' $placement_package_name = 'nova-placement-api'
$cells_package_name = 'nova-cells' $cells_package_name = 'nova-cells'