openstack/puppet-nova
Code Issues Proposed changes

Merge "Debian is using Python 3 for the client"

Browse Source
This commit is contained in:
Zuul
2018-05-09 21:33:15 +00:00
committed by Gerrit Code Review
parent a49e3f5254 2c1a49578c
commit 86984823f8
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/client.pp
View File

@@ -12,9 +12,11 @@ class nova::client(
$ensure = 'present' $ensure = 'present'
) { ) {
include ::nova::deps include ::nova::deps
include ::nova::params
package { 'python-novaclient': package { 'python-novaclient':
ensure => $ensure, ensure => $ensure,
name => $::nova::params::client_package,
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
} }

2
manifests/params.pp
View File

@@ -13,6 +13,7 @@ class nova::params {
case $::osfamily { case $::osfamily {
'RedHat': { 'RedHat': {
# package names # package names
$client_package = 'python-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'
@@ -85,6 +86,7 @@ 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'