Tweak string to make it clear that people can pass a host for VMware
Merge pull request #382 from vuntz/vmware-string

Tweak string to make it clear that people can pass a host for VMware
Use helpers from new crowbar-openstack cookbook
Avoid unneeded search for nagios when nagios isn't used
Merge pull request #384 from vuntz/no-nagios-search

Avoid unneeded search for nagios when nagios isn't used
Merge pull request #383 from vuntz/openstack-helper

Use helpers from new crowbar-openstack cookbook
Set keystone_ec2_url in nova.conf

This is required when keystone is not on the same host as the nova
controller, or when using HA.
Merge pull request #386 from vuntz/keystone_ec2_url

Set keystone_ec2_url in nova.conf
Fix VMware spelling
Merge pull request #388 from mjura/vmware-rename

Fix VMware spelling