Minor changes and related cooments for explanation

manifests/profile/ceilometer/common.pp

@@ -4,16 +4,16 @@ class iaas::profile::ceilometer::common (
   $password = hiera('iaas::profile::ceilometer::password', undef),
   $region = hiera('iaas::region', undef),
   $endpoint = hiera('iaas::role::endpoint::main_address', undef),
-#Costa - added $rhosts
+#added $rhosts
   $rhosts = hiera('iaas::profile::rabbitmq::rhosts', undef),
   $rabbitmq_user = hiera('iaas::profile::rabbitmq::user', undef),
   $rabbitmq_password = hiera('iaas::profile::rabbitmq::password', undef),
 ) {
   class { '::ceilometer':
     metering_secret => $secret,
-#Costa - added rabbit_hosts
+#added rabbit_hosts
 #    rabbit_hosts => [ $endpoint ],
-    rpc_backend => 'rabbit',
+#    rpc_backend => 'rabbit',
     rabbit_hosts => $rhosts,
     rabbit_userid => $rabbitmq_user,
     rabbit_password => $rabbitmq_password,

manifests/profile/ceilometer/controller.pp

@@ -10,12 +10,12 @@ class iaas::profile::ceilometer::controller (
 
   $zookeeper_id = undef,
   $zookeeper_max_connections = 128,
+
+  $coordination_ip = hiera('iaas::role::endpoint:coordination', undef),
 ) {
-#Costa
-#  include iaas::resources::connectors
+  include iaas::resources::connectors
 
-#Costa
-#  iaas::resources::database { 'ceilometer': }
+  iaas::resources::database { 'ceilometer': }
 
   include iaas::profile::ceilometer::common
 
@@ -30,11 +30,14 @@ class iaas::profile::ceilometer::controller (
   }
 
   class { '::ceilometer::api':
-    host => $::facts["ipaddress_${admin_interface}"],
+#VIP value assigned to keystone_host
+#    keystone_host => $::facts["ipaddress_${admin_interface}"],
+    keystone_host => $endpoint,
     enabled => true,
     keystone_password => $password,
     keystone_auth_uri => "http://${endpoint}:5000/v2.0",
-    keystone_identity_uri => "http://${endpoint}:35357",
+#identity_uri planned to be inplemented
+#    keystone_identity_uri => "http://${endpoint}:35357",
   }
 
   class { '::ceilometer::db':
@@ -43,7 +46,7 @@ class iaas::profile::ceilometer::controller (
   }
 
   package { 'python-zake': }
-#Costa - config zookeeper
+#config zookeeper commented
 #  class { 'zookeeper':
 #    id => $zookeeper_id,
 #    client_ip => $::facts["ipaddress_${admin_interface}"],
@@ -52,11 +55,15 @@ class iaas::profile::ceilometer::controller (
 #  }
 
   class { '::ceilometer::agent::central':
-    coordination_url => "kazoo://${$admin_ip}:2181",
+#added coordination endpoints for ceilometer
+#    coordination_url => "kazoo://${$admin_ip}:2181",
+    coordination_url => "kazoo://${$coordination_ip}",
   }
 
   class { '::ceilometer::alarm::evaluator':
-    coordination_url => "kazoo://${$admin_ip}:2181",
+#added coordination endpoints for ceilometer
+#    coordination_url => "kazoo://${$admin_ip}:2181",
+    coordination_url => "kazoo://${$coordination_ip}",
   }
 
   class { '::ceilometer::expirer':
@@ -67,6 +74,7 @@ class iaas::profile::ceilometer::controller (
   class { '::ceilometer::collector': }
   class { '::ceilometer::agent::notification': }
 
+#HAproxy values commented
 #  @@haproxy::balancermember { "ceilometer_api_${::fqdn}":
 #    listening_service => 'ceilometer_api_cluster',
 #    server_names => $::hostname,