Merge pull request #50 from alop/ceph-opts

templatizing the default rbd values for ceph.

README.md

@@ -65,6 +65,9 @@ Attributes
 * `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["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
 =====

attributes/default.rb

@@ -107,6 +107,11 @@ default["cinder"]["volume"]["volume_driver"] = "cinder.volume.driver.ISCSIDriver
 default["cinder"]["volume"]["volume_group"] = "cinder-volumes"
 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
 when "fedora", "redhat", "centos" # :pragma-foodcritic: ~FC024 - won't fix this
   default["cinder"]["platform"] = {

templates/default/cinder.conf.erb

@@ -536,16 +536,16 @@ volume_group=<%= node["cinder"]["volume"]["volume_group"] %>
 
 # iscsi_port=3260
 #### (IntOpt) The port that the iSCSI daemon is listening on
-
-# rbd_pool=rbd
+<% if node["cinder"]["volume"]["volume_driver"] == 'cinder.volume.driver.RBDDriver' %>
+rbd_pool=<%= node["cinder"]["rbd_pool"] %>
 #### (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
 
-# rbd_secret_uuid=<None>
+rbd_secret_uuid=<%= node["cinder"]["rbd_secret_uuid"] %>
 #### (StrOpt) the libvirt uuid of the secret for the rbd_uservolumes
-
+<% end %>
 # volume_tmp_dir=<None>
 #### (StrOpt) where to store temporary image files if the volume driver
 ####          does not write them directly to the volume