Provide nova the option to choose cinder version

The default version in nova is
v2(volumev2:cinderv2:publicURL).

Change-Id: I550c8f30f6479890bbb961ffdd47219b256c5f79
Closes-Bug: #1391780

CHANGELOG.md

@@ -18,6 +18,7 @@ This file is used to list changes made in each version of cookbook-openstack-com
 * Add [ssl] section, needed to communicate with Glance when using https; add cinder_ca_certificates_file and cinder_api_insecure
 * Add more attributes for nova.conf DEFAULT section
 * Update and remove the outdated options
+* Add cinder_catalog_info
 
 ## 9.3.1
 * Move auth configuration from api-paste.ini to nova.conf

README.md

@@ -192,6 +192,7 @@ Cinder Attributes
 
 * `openstack["compute"]["block-storage"]["cinder_ca_certificates_file"]` - Location of ca certificates file to use for cinder client requests.
 * `openstack["compute"]["block-storage"]["cinder_api_insecure"]` - Allow to perform insecure SSL requests to cinder.
+* `openstack["compute"]["block-storage"]["cinder_catalog_info"]` - Info to match when looking for cinder in the service catalog.
 
 Networking Attributes
 ---------------------

attributes/default.rb

@@ -311,6 +311,9 @@ default['openstack']['compute']['block-storage']['cinder_ca_certificates_file']
 # Allow to perform insecure SSL requests to cinder
 default['openstack']['compute']['block-storage']['cinder_api_insecure'] = false
 
+# Info to match when looking for cinder in the service catalog
+default['openstack']['compute']['block-storage']['cinder_catalog_info'] = 'volumev2:cinderv2:publicURL'
+
 # quota settings
 default['openstack']['compute']['config']['quota_security_groups'] = 50
 default['openstack']['compute']['config']['quota_security_group_rules'] = 20

spec/nova-common_spec.rb

@@ -250,6 +250,7 @@ describe 'openstack-compute::nova-common' do
         expect(chef_run).to render_file(file.name).with_content(/^key_file=$/)
         expect(chef_run).to render_file(file.name).with_content(/^cinder_ca_certificates_file=$/)
         expect(chef_run).to render_file(file.name).with_content(/^cinder_api_insecure=false/)
+        expect(chef_run).to render_file(file.name).with_content(/^cinder_catalog_info=volumev2:cinderv2:publicURL$/)
         expect(chef_run).to render_file(file.name).with_content(/^hash_algorithms = md5$/)
         expect(chef_run).to render_file(file.name).with_content(/^insecure = false$/)
         expect(chef_run).to render_file(file.name).with_content(/^glance_api_insecure=false$/)
@@ -286,8 +287,10 @@ describe 'openstack-compute::nova-common' do
       it 'sets cinder options' do
         node.set['openstack']['compute']['block-storage']['cinder_ca_certificates_file'] = 'dir/to/path'
         node.set['openstack']['compute']['block-storage']['cinder_api_insecure'] = true
+        node.set['openstack']['compute']['block-storage']['cinder_catalog_info'] = 'volume:cinder:publicURL'
         expect(chef_run).to render_file(file.name).with_content(/^cinder_api_insecure=true$/)
         expect(chef_run).to render_file(file.name).with_content(%r{^cinder_ca_certificates_file=dir/to/path$})
+        expect(chef_run).to render_file(file.name).with_content(/^cinder_catalog_info=volume:cinder:publicURL$/)
       end
 
       it 'sets memcached server(s)' do

templates/default/nova.conf.erb

@@ -146,6 +146,9 @@ cinder_ca_certificates_file=<%= node['openstack']['compute']['block-storage']['c
 # Allow to perform insecure SSL requests to cinder
 cinder_api_insecure=<%= node['openstack']['compute']['block-storage']['cinder_api_insecure'] %>
 
+# Info to match when looking for cinder in the service catalog
+cinder_catalog_info=<%= node['openstack']['compute']['block-storage']['cinder_catalog_info'] %>
+
 ##### COMPUTE #####
 compute_driver=<%= node["openstack"]["compute"]["driver"] %>
 <% if node["openstack"]["compute"]["default_ephemeral_format"] %>