diff --git a/README.md b/README.md index 0e65e34..ca3a655 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,9 @@ Attributes * `cinder["syslog"]["use"]` * `cinder["syslog"]["facility"]` * `cinder["syslog"]["config_facility"]` -* `cinder["platform"]` = hash of platform specific package/service names and options +* `cinder["platform"]` - hash of platform specific package/service names and options +* `cinder["volume"]["state_path"]` - Top-level directory for maintaining cinder's state +* `cinder["volume"]["volume_group"]` - Name for the VG that will contain exported volumes Templates ===== diff --git a/attributes/default.rb b/attributes/default.rb index 7029ce6..266ab5b 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -69,6 +69,9 @@ default["cinder"]["syslog"]["config_facility"] = "local2" default["cinder"]["api"]["ratelimit"] = "True" +default["cinder"]["volume"]["state_path"] = "/var/lib/cinder" +default["cinder"]["volume"]["volume_group"] = "cinder-volumes" + case platform when "fedora", "redhat", "centos" default["cinder"]["platform"] = { diff --git a/templates/default/cinder.conf.erb b/templates/default/cinder.conf.erb index 7c769ea..e978d2d 100644 --- a/templates/default/cinder.conf.erb +++ b/templates/default/cinder.conf.erb @@ -66,6 +66,7 @@ sql_connection=<%= @sql_connection %> #### (StrOpt) Directory where cinder binaries are installed # state_path=$pybasedir +state_path=<%= node["cinder"]["volume"]["state_path"] %> #### (StrOpt) Top-level directory for maintaining cinder's state my_ip=<%= node["ipaddress"] %> @@ -515,6 +516,7 @@ rabbit_port=<%= @rabbit_port %> ######## defined in cinder.volume.driver ######## # volume_group=cinder-volumes +volume_group=<%= node["cinder"]["volume"]["volume_group"] %> #### (StrOpt) Name for the VG that will contain exported volumes # num_shell_tries=3