Merge pull request #289 from rcbops/sprint

End of Sprint 17 Merge
bump monit rev
version bump corosync
Merge pull request #301 from rackerjoe/work

version bump monit and corosync
Merge branch 'sprint' of github.com:rcbops/chef-cookbooks
End of Sprint18
Merge pull request #303 from rackerjoe/sprint18

End of Sprint 18
Merge branch 'master' of github.com:rcbops/chef-cookbooks into sprint
Merge branch 'sprint' of github.com:rcbops/chef-cookbooks into sprint
Merge branch 'sprint' of github.com:rcbops/chef-cookbooks into sprint
ENHANCEMENT: Default to Folsom
Auto Updating osops-utils submodule
Merge pull request #305 from mancdaz/sprint

add ha-controller{1,2} roles
Auto Updating haproxy submodule
Auto Updating openstack-ha submodule
Auto Updating nova submodule
Auto Updating glance submodule
Merge pull request #304 from rackerjoe/sprint

ENHANCEMENT: Default to Folsom
Auto Updating cinder submodule
Auto Updating nova submodule