openstack/cookbook-openstack-block-storage
Code Issues Proposed changes

Publish correct gpfs attributes to cinder.conf

Browse Source 
Three extra attributes were being published to cinder.conf when volume_driver
was set to gpfs.  This patch corrects this problem.

Closes-Bug: #1320372
Change-Id: I4e1290aeac92c56beaad0ebd0941afaf249469e2
This commit is contained in:
Bill Owen
2014-05-16 13:43:23 -07:00
parent 5775f81cf6
commit 860a4ea53a
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -1,6 +1,10 @@
openstack-block-storage Cookbook CHANGELOG openstack-block-storage Cookbook CHANGELOG
============================== ==============================
This file is used to list changes made in each version of the openstack-block-storage cookbook. This file is used to list changes made in each version of the openstack-block-storage cookbook.
## 9.2.1
### Bug
* Remove output of extra config lines in cinder.conf.erb
## 9.2.0 ## 9.2.0
### Blue print ### Blue print
* Get VMware vCenter password from databag * Get VMware vCenter password from databag

2
metadata.rb
View File

@@ -5,7 +5,7 @@ maintainer_email 'cookbooks@lists.tfoundry.com'
license 'Apache 2.0' license 'Apache 2.0'
description 'The OpenStack Advanced Volume Management service Cinder.' description 'The OpenStack Advanced Volume Management service Cinder.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '9.2.0' version '9.2.1'
recipe 'openstack-block-storage::api', 'Installs the cinder-api, sets up the cinder database, and cinder service/user/endpoints in keystone' recipe 'openstack-block-storage::api', 'Installs the cinder-api, sets up the cinder database, and cinder service/user/endpoints in keystone'
recipe 'openstack-block-storage::client', 'Install packages required for cinder client' recipe 'openstack-block-storage::client', 'Install packages required for cinder client'

10
templates/default/cinder.conf.erb
View File

@@ -933,8 +933,8 @@ vmware_image_transfer_timeout_secs = <%= node['openstack']['block-storage']['vmw
vmware_max_objects_retrieval = <%= node['openstack']['block-storage']['vmware']['vmware_max_objects_retrieval'] %> vmware_max_objects_retrieval = <%= node['openstack']['block-storage']['vmware']['vmware_max_objects_retrieval'] %>
<% end %> <% end %>
######## defined in cinder.openstack.common.cfg:CommonConfigOpts ########
<% if node["openstack"]["block-storage"]["volume"]["driver"] == "cinder.volume.drivers.gpfs.GPFSDriver" %> <% if node["openstack"]["block-storage"]["volume"]["driver"] == "cinder.volume.drivers.gpfs.GPFSDriver" %>
######## defined in cinder.openstack.volume.drivers.ibm.gpfs ########
# Specifies the path of the GPFS directory where Block Storage # Specifies the path of the GPFS directory where Block Storage
# volume and snapshot files are stored. (string value) # volume and snapshot files are stored. (string value)
@@ -976,11 +976,3 @@ gpfs_sparse_volumes = <%= node['openstack']['block-storage']['gpfs']['gpfs_spars
gpfs_storage_pool = <%= node['openstack']['block-storage']['gpfs']['gpfs_storage_pool'] %> gpfs_storage_pool = <%= node['openstack']['block-storage']['gpfs']['gpfs_storage_pool'] %>
<% end %> <% end %>
san_ip=<%= node["openstack"]["block-storage"]["storwize"]["san_ip"] %>
#### (StrOpt) IP address of SAN controller
san_login=<%= node["openstack"]["block-storage"]["storwize"]["san_login"] %>
#### (StrOpt) Username for SAN controller
san_private_key=<%= node["openstack"]["block-storage"]["storwize"]["san_private_key"] %>
#### (StrOpt) Filename of private key to use for SSH authentication