Align packstack templates with ceilometer upstream git repo

This patch is needed to have packstack aligned with changes in the
upstream module will provide:

*) a new class called ceilometer::agent::auth;
*) add the firewall rule to open ceilometer api port;
*) changes needed in the nova_ceilometer module to support
  agent::auth;
*) Added alarm module

The patch got restored because of huge waiting on 54797

Change-Id: I7c7762b6faeae8e8677d0fc8d972e1dcb0180f7e

.gitmodules

@@ -75,7 +75,7 @@
 	url = https://github.com/puppetlabs/puppetlabs-haproxy.git
 [submodule "packstack/puppet/modules/ceilometer"]
 	path = packstack/puppet/modules/ceilometer
-	url = https://github.com/packstack/puppet-ceilometer.git
+	url = https://github.com/stackforge/puppet-ceilometer.git
 [submodule "packstack/puppet/modules/mongodb"]
 	path = packstack/puppet/modules/mongodb
 	url = https://github.com/puppetlabs/puppetlabs-mongodb.git

packstack/plugins/ceilometer_800.py

@@ -94,6 +94,11 @@ def initSequences(controller):
 def create_manifest(config):
     manifestfile = "%s_ceilometer.pp" % config['CONFIG_CEILOMETER_HOST']
     manifestdata = getManifestTemplate("ceilometer.pp")
+    hosts = config['CONFIG_CEILOMETER_HOST']
+    config['FIREWALL_ALLOWED'] = "'%s'" % hosts
+    config['FIREWALL_SERVICE_NAME'] = 'ceilometer-api'
+    config['FIREWALL_PORTS'] = "'8777'"
+    manifestdata += getManifestTemplate("firewall.pp")
     appendManifestFile(manifestfile, manifestdata)
 
 

packstack/puppet/templates/ceilometer.pp

@@ -1,4 +1,3 @@
-
 class { 'mongodb':
     enable_10gen => false,
     port         => '27017',
@@ -32,11 +31,20 @@ class { 'ceilometer::collector':
     require => Class['mongodb'],
 }
 
-class { 'ceilometer::agent::central':
+class { 'ceilometer::agent::auth':
     auth_url      => 'http://%(CONFIG_KEYSTONE_HOST)s:35357/v2.0',
     auth_password => '%(CONFIG_CEILOMETER_KS_PW)s',
 }
 
+class { 'ceilometer::agent::central':
+}
+
+class { 'ceilometer::alarm::notifier':
+}
+
+class { 'ceilometer::alarm::evaluator':
+}
+
 class { 'ceilometer::api':
     keystone_host     => '%(CONFIG_KEYSTONE_HOST)s',
     keystone_password => '%(CONFIG_CEILOMETER_KS_PW)s',

packstack/puppet/templates/nova_ceilometer.pp

@@ -7,11 +7,14 @@ class { 'ceilometer':
     debug           => false
 }
 
-class { 'ceilometer::agent::compute':
+class { 'ceilometer::agent::auth':
     auth_url      => 'http://%(CONFIG_KEYSTONE_HOST)s:35357/v2.0',
     auth_password => '%(CONFIG_CEILOMETER_KS_PW)s',
 }
 
+class { 'ceilometer::agent::compute':
+}
+
 # if fqdn is not set correctly we have to tell compute agent which host it should query
 if !$::fqdn or $::fqdn != $::hostname {
     ceilometer_config {