Skip to content

Commit

Permalink
Merge pull request #75 from mattt416/remove_pool_size_config_option
Browse files Browse the repository at this point in the history
Merged automatically by jenkins after successful build test
  • Loading branch information
rcbjenkins committed Aug 28, 2013
2 parents 7a9400d + cdbaf6f commit b969793
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,12 @@ Default (LVM)

By default, the 'lvm' provider is chosen. No special configuration is
necessary on the chef side, but the cinder volume node must have an
lvm volume group named cinder volumes.
lvm volume group named cinder-volumes. The attributes below can be
adjusted for non-standard LVM configurations:

node["cinder"]["storage"]["lvm"]["volume_group"] = "cinder-volumes"
node["cinder"]["storage"]["lvm"]["volume_clear"] = "zero"
node["cinder"]["storage"]["lvm"]["config"] = "/etc/lvm/lvm.conf"

EMC
---
Expand Down
1 change: 0 additions & 1 deletion attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
# LVM Settings
default["cinder"]["storage"]["lvm"]["volume_group"] = "cinder-volumes" # name from volume group
default["cinder"]["storage"]["lvm"]["volume_clear"] = "zero" # none, zero, shred
default["cinder"]["storage"]["lvm"]["pool_size"] = "None" # Size of thin provisioning pool
default["cinder"]["storage"]["lvm"]["config"] = "/etc/lvm/lvm.conf" # Path of LVM config file

# solidfire settings - set these if you are using solidfire
Expand Down
1 change: 0 additions & 1 deletion providers/conf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
when "lvm"
storage_options["volume_group"] = node["cinder"]["storage"]["lvm"]["volume_group"]
storage_options["volume_clear"] = node["cinder"]["storage"]["lvm"]["volume_clear"]
storage_options["volume_pool_size"] = node["cinder"]["storage"]["lvm"]["pool_size"]
else
msg = "#{storage_provider}, is not currently supported by these cookbooks. Please change the storage provider attribute in your environment to one of lvm, emc, solidfire, netappiscsi, netappnfsdirect."
Chef::Application.fatal! msg
Expand Down

0 comments on commit b969793

Please sign in to comment.