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

Merge pull request #50 from alop/ceph-opts

Browse Source 
templatizing the default rbd values for ceph.
This commit is contained in:
Scott Lampert
2013-05-08 17:12:40 -07:00
parent 6c251981b9 de6fed1faf
commit 26f3df8b39
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -65,6 +65,9 @@ Attributes
* `cinder["volume"]["volume_group"]` - Name for the VG that will contain exported volumes * `cinder["volume"]["volume_group"]` - Name for the VG that will contain exported volumes
* `cinder["volume"]["iscsi_helper"]` - ISCSI target user-land tool to use * `cinder["volume"]["iscsi_helper"]` - ISCSI target user-land tool to use
* `cinder["netapp"]["enabled"]` - Enable netapp-specific options * `cinder["netapp"]["enabled"]` - Enable netapp-specific options
* `cinder["rbd_pool"]` - RADOS Block Device pool to use
* `cinder["rbd_user"]` - User for Cephx Authentication
* `cinder["rbd_secret_uuid"]` - Secret UUID for Cephx Authentication
Testing Testing
===== =====

5
attributes/default.rb
View File

@@ -107,6 +107,11 @@ default["cinder"]["volume"]["volume_driver"] = "cinder.volume.driver.ISCSIDriver
default["cinder"]["volume"]["volume_group"] = "cinder-volumes" default["cinder"]["volume"]["volume_group"] = "cinder-volumes"
default["cinder"]["volume"]["iscsi_helper"] = "tgtadm" default["cinder"]["volume"]["iscsi_helper"] = "tgtadm"
# Ceph/RADOS options
default["cinder"]["rbd_pool"] = "rbd"
default["cinder"]["rbd_user"] = nil
default["cinder"]["rbd_secret_uuid"] = nil
case platform case platform
when "fedora", "redhat", "centos" # :pragma-foodcritic: ~FC024 - won't fix this when "fedora", "redhat", "centos" # :pragma-foodcritic: ~FC024 - won't fix this
default["cinder"]["platform"] = { default["cinder"]["platform"] = {

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

@@ -536,16 +536,16 @@ volume_group=<%= node["cinder"]["volume"]["volume_group"] %>
# iscsi_port=3260 # iscsi_port=3260
#### (IntOpt) The port that the iSCSI daemon is listening on #### (IntOpt) The port that the iSCSI daemon is listening on
<% if node["cinder"]["volume"]["volume_driver"] == 'cinder.volume.driver.RBDDriver' %>
# rbd_pool=rbd rbd_pool=<%= node["cinder"]["rbd_pool"] %>
#### (StrOpt) the RADOS pool in which rbd volumes are stored #### (StrOpt) the RADOS pool in which rbd volumes are stored
# rbd_user=<None> rbd_user=<%= node["cinder"]["rbd_user"] %>
#### (StrOpt) the RADOS client name for accessing rbd volumes #### (StrOpt) the RADOS client name for accessing rbd volumes
# rbd_secret_uuid=<None> rbd_secret_uuid=<%= node["cinder"]["rbd_secret_uuid"] %>
#### (StrOpt) the libvirt uuid of the secret for the rbd_uservolumes #### (StrOpt) the libvirt uuid of the secret for the rbd_uservolumes
<% end %>
# volume_tmp_dir=<None> # volume_tmp_dir=<None>
#### (StrOpt) where to store temporary image files if the volume driver #### (StrOpt) where to store temporary image files if the volume driver
#### does not write them directly to the volume #### does not write them directly to the volume