Merge "allow specifying bind port"

recipes/cinder-common.rb

@@ -75,7 +75,8 @@ template '/etc/cinder/cinder.conf' do
     glance_port: glance_api_endpoint.port,
     ibmnas_pass: ibmnas_pass,
     solidfire_pass: solidfire_pass,
-    volume_api_address: cinder_api_endpoint.host
+    volume_api_bind_address: cinder_api_endpoint.host,
+    volume_api_bind_port: cinder_api_endpoint.port
   )
 end
 

spec/cinder_common_spec.rb

@@ -68,6 +68,11 @@ describe 'openstack-block-storage::cinder-common' do
         expect(chef_run).to render_file(file.name).with_content('osapi_volume_listen=1.1.1.1')
       end
 
+      it 'has osapi_volume_listen_port set' do
+        node.set['openstack']['endpoints']['block-storage-api']['port'] = '9999'
+        expect(chef_run).to render_file(file.name).with_content('osapi_volume_listen_port=9999')
+      end
+
       it 'has rpc_thread_pool_size' do
         expect(chef_run).to render_file(file.name).with_content('rpc_thread_pool_size=64')
       end

templates/default/cinder.conf.erb

@@ -215,12 +215,11 @@ quota_driver=<%= node["openstack"]["block-storage"]["quota_driver"] %>
 ####          periodic task scheduler to reduce stampeding. (Disable by
 ####          setting to 0)
 
-osapi_volume_listen=<%= @volume_api_address %>
+osapi_volume_listen=<%= @volume_api_bind_address %>
 #### (StrOpt) IP address for OpenStack Volume API to listen
 
-# osapi_volume_listen_port=8776
 #### (IntOpt) port for os volume api to listen
-
+osapi_volume_listen_port=<%= @volume_api_bind_port %>
 
 ######## defined in cinder.test ########