openstack/puppet-nova
Code Issues Proposed changes

Switch cinder_catalog_info from v2 to v3

Browse Source 
nova removed cinder v2 support in [1]

[1] https://review.openstack.org/#/c/501874/

Change-Id: I13f1f25c2b679e366ef69323a03236e111804b33
This commit is contained in:
yatin
2017-09-22 13:32:27 +05:30
parent a459fc097b
commit 0469856f16
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@@ -329,7 +329,7 @@
# (optional) Info to match when looking for cinder in the service # (optional) Info to match when looking for cinder in the service
# catalog. Format is: separated values of the form: # catalog. Format is: separated values of the form:
# <service_type>:<service_name>:<endpoint_type> # <service_type>:<service_name>:<endpoint_type>
# Defaults to 'volumev2:cinderv2:publicURL' # Defaults to $::os_service_default
# #
# [*upgrade_level_cells*] # [*upgrade_level_cells*]
# (optional) Sets a version cap for messages sent to local cells services # (optional) Sets a version cap for messages sent to local cells services
@@ -511,7 +511,7 @@ class nova(
$notify_api_faults = false, $notify_api_faults = false,
$notify_on_state_change = undef, $notify_on_state_change = undef,
$os_region_name = $::os_service_default, $os_region_name = $::os_service_default,
$cinder_catalog_info = 'volumev2:cinderv2:publicURL', $cinder_catalog_info = $::os_service_default,
$upgrade_level_cells = $::os_service_default, $upgrade_level_cells = $::os_service_default,
$upgrade_level_cert = $::os_service_default, $upgrade_level_cert = $::os_service_default,
$upgrade_level_compute = $::os_service_default, $upgrade_level_compute = $::os_service_default,

7
releasenotes/notes/update_cinder_catalog_info_v2_to_v3-c5d442dbbae2327e.yaml Normal file
View File

@@ -0,0 +1,7 @@
---
upgrade:
- The default value for nova::cinder_catalog_info is changed to
::os_service_default(use default set by nova which is currently
'volumev3:cinderv3:publicURL') from 'volumev2:cinderv2:publicURL'
because nova has removed the support of cinderv2 in
https://review.openstack.org/#/c/501874/.

2
spec/classes/nova_init_spec.rb
View File

@@ -62,7 +62,7 @@ describe 'nova' do
is_expected.to contain_nova_config('DEFAULT/rpc_response_timeout').with_value('<SERVICE DEFAULT>') is_expected.to contain_nova_config('DEFAULT/rpc_response_timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('DEFAULT/control_exchange').with_value('<SERVICE DEFAULT>') is_expected.to contain_nova_config('DEFAULT/control_exchange').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('cinder/os_region_name').with_value('<SERVICE DEFAULT>') is_expected.to contain_nova_config('cinder/os_region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('cinder/catalog_info').with('value' => 'volumev2:cinderv2:publicURL') is_expected.to contain_nova_config('cinder/catalog_info').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('DEFAULT/cpu_allocation_ratio').with_value('<SERVICE DEFAULT>') is_expected.to contain_nova_config('DEFAULT/cpu_allocation_ratio').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('DEFAULT/ram_allocation_ratio').with_value('<SERVICE DEFAULT>') is_expected.to contain_nova_config('DEFAULT/ram_allocation_ratio').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('DEFAULT/disk_allocation_ratio').with_value('<SERVICE DEFAULT>') is_expected.to contain_nova_config('DEFAULT/disk_allocation_ratio').with_value('<SERVICE DEFAULT>')