Cleaned up keystone cookbook
fix merge conflicts
fixes a white space problem
Merge branch 'cmfl'
Fixes a problem with whitespace
cleanup glance recipe to remove unneeded code
removed the included monitoring and rsyslog includes
Merge branch 'feature/cleanup_glance' into develop
cleanup glance recipe to remove unneeded code
removed the included monitoring and rsyslog includes
cleaned up unneeded libraries
fix merge conflicts
cleaned up nova cookbook
fix merge conflicts
added initial vagrant config for HA controller testing
remove unneeded packages
remove nova-volume role from controller
removed monitoring resources
Merge branch 'release/cleanup_mysql-openstack'
removed unneeded cookbooks
Merge branch 'feature/remove_unneeded_cookbooks' into develop