From 0469856f160c61077a412815463ca4c382ae18c7 Mon Sep 17 00:00:00 2001 From: yatin Date: Fri, 22 Sep 2017 13:32:27 +0530 Subject: [PATCH] Switch cinder_catalog_info from v2 to v3 nova removed cinder v2 support in [1] [1] https://review.openstack.org/#/c/501874/ Change-Id: I13f1f25c2b679e366ef69323a03236e111804b33 --- manifests/init.pp | 4 ++-- ...date_cinder_catalog_info_v2_to_v3-c5d442dbbae2327e.yaml | 7 +++++++ spec/classes/nova_init_spec.rb | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/update_cinder_catalog_info_v2_to_v3-c5d442dbbae2327e.yaml diff --git a/manifests/init.pp b/manifests/init.pp index ca6a21786..de7b08951 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -329,7 +329,7 @@ # (optional) Info to match when looking for cinder in the service # catalog. Format is: separated values of the form: # :: -# Defaults to 'volumev2:cinderv2:publicURL' +# Defaults to $::os_service_default # # [*upgrade_level_cells*] # (optional) Sets a version cap for messages sent to local cells services @@ -511,7 +511,7 @@ class nova( $notify_api_faults = false, $notify_on_state_change = undef, $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_cert = $::os_service_default, $upgrade_level_compute = $::os_service_default, diff --git a/releasenotes/notes/update_cinder_catalog_info_v2_to_v3-c5d442dbbae2327e.yaml b/releasenotes/notes/update_cinder_catalog_info_v2_to_v3-c5d442dbbae2327e.yaml new file mode 100644 index 000000000..8e60e8b9a --- /dev/null +++ b/releasenotes/notes/update_cinder_catalog_info_v2_to_v3-c5d442dbbae2327e.yaml @@ -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/. diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb index 73efb1da4..ed9ff5ac9 100644 --- a/spec/classes/nova_init_spec.rb +++ b/spec/classes/nova_init_spec.rb @@ -62,7 +62,7 @@ describe 'nova' do is_expected.to contain_nova_config('DEFAULT/rpc_response_timeout').with_value('') is_expected.to contain_nova_config('DEFAULT/control_exchange').with_value('') is_expected.to contain_nova_config('cinder/os_region_name').with_value('') - 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('') is_expected.to contain_nova_config('DEFAULT/cpu_allocation_ratio').with_value('') is_expected.to contain_nova_config('DEFAULT/ram_allocation_ratio').with_value('') is_expected.to contain_nova_config('DEFAULT/disk_allocation_ratio').with_value('')