only include ceilometer section if we are using ceilometer
Merge branch 'grizzly' of https://github.com/rcbops-cookbooks/nova into grizzly
workaround nova_conf subscription issues to restart services
Merge pull request #277 from willkelly/subscribe_nova_network

Merged automatically by jenkins after successful build test