Merge pull request #79 from rohara/master

Fix enable/disable of heat_cfg and heat_cloudwatch
add IPAPPEND 2 to pxe template

https://bugzilla.redhat.com/show_bug.cgi?id=1039698
Merge pull request #81 from cwolferh/ipappend_2

add IPAPPEND 2 to pxe template
Fix manifests to work with updated puppet modules

BZ #1040021 - This patch updates the nova/neutron controller and
compute manifests 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.

In addition, the nova compute manifest does not and should not call
the nova::api class. Instead, install the metadata-api service using
nova::generic_service.

https://bugzilla.redhat.com/show_bug.cgi?id=1040021
Merge pull request #80 from rohara/controller_update

Fix controller.pp to work with updated puppet modules
BZ #1040610 Open Ceilometer API port on controller node
Merge pull request #83 from jistr/open_ceilometer_port

BZ #1040610 Open Ceilometer API port on controller node
use the right variable name
Merge pull request #84 from cwolferh/swift-typo-fix

use the right variable name
Update RHEL OS description, relies on Foreman #3720
BZ #1042933 - neutron-server fails to start

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

Neutron-server fails to start when deploying Neutron controller host group via
Foreman.

This is due to a new neutron-db-manage command that needs to be run, but is not
yet included in puppet-neutron.  This patch mimics what was done in
packstack[1], fixing this until the proper fix is added to the puppet module we
depend on.

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1037675
Merge pull request #89 from jguiditta/bz1042933_neutron_db_stamp

BZ #1042933 - neutron-server fails to start
Merge pull request #87 from domcleal/os-desc

Update RHEL OS description, relies on Foreman #3720
BZ #1043964 - Fix to move neutron setup after db setup.

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

The 'neutron-db-manage upgrade' command was failing on first runs of puppet
agent due to a race condition where the database was not necessarily created
before this command was run.  The order matters, so we have now specified this
more precisely.
Merge pull request #91 from jguiditta/bz1043964_neutron_db_dep

BZ #1043964 - Fix to move neutron setup after db setup.