Tweak string to make it clear that people can pass a host for VMware
Rename VMware volume attribute to volume_folder

This is really about a folder, so call it so.
Merge pull request #207 from vuntz/vmware-improvements

Rename VMware volume attribute to volume_folder
Fix upgrade from roxy

Copying straight from the template is nice, but can break when migrating
from a long time ago and then renaming a key.
Use helpers from new crowbar-openstack cookbook
Merge pull request #208 from vuntz/fix-upgrade-roxy

Fix upgrade from roxy
Merge pull request #209 from vuntz/openstack-helper

Use helpers from new crowbar-openstack cookbook
Make cinder.conf owned by root:cinder, instead of cinder:root

We don't want the cinder user to be able to write the file.
Merge pull request #210 from vuntz/fix-owner

Make cinder.conf owned by root:cinder, instead of cinder:root
Fix VMware spelling
Merge pull request #211 from mjura/vmware-rename

Fix VMware spelling