Merge pull request #79 from rohara/master

Fix enable/disable of heat_cfg and heat_cloudwatch
Fix controller.pp to work with updated puppet modules

BZ #1040021 - This patch updates the neutron controller manifest to
work with updated pupet modules. Specifically, the nova auth setting
should now be done via nova::api class, not nova_config. Also, the
neutron database connection should be set via the neutron::server
class, not neutron_config.

https://bugzilla.redhat.com/show_bug.cgi?id=1040021