fix sm ceilometer provisioning

Partial-Bug: #1695741

Pending changes:
1. newton testing
2. compute provisioning for ceilometer

PATCH 2:
fix merge conflict

Conflicts:
	contrail/environment/modules/contrail/manifests/profile/openstack_controller.pp

Change-Id: Ia6a0cb2958e5146ae1a43613b8e376e89091e46f

contrail/environment/modules/contrail/manifests/profile/mongodb.pp

@@ -2,29 +2,17 @@
 # The puppet module to set up mongodb::server and mongodb::client on database node
 #
 #
-class contrail::profile::mongodb {
-      $controller_address_management = $::contrail::params::controller_address_management
-      $database_ip_list          = $::contrail::params::openstack_ip_list
-      $primary_db_ip             = $::contrail::params::openstack_ip_list[0]
-      # Mongo DB Replset members are primary_db + slave_members below - All database nodes
-      $mongo_slave_ip_list_str   = inline_template('<%= @database_ip_list.delete_if {|x| x == @primary_db_ip }.join(";") %>')
-      $mongo_slave_ip_list       = split($mongo_slave_ip_list_str, ';')
-      $ceilometer_mongo_password = $::contrail::params::os_mongo_password
-      $ceilometer_password       = $::contrail::params::os_ceilometer_password
-      $ceilometer_meteringsecret = $::contrail::params::os_metering_secret
-      $mongodb_bind_address      = $::contrail::params::host_ip
-      $contrail_logoutput        = $::contrail::params::contrail_logoutput
-
-      # TODO: Document the function
-      define add_rs_members ($primary_db_ip) {
-        # Mongo DB Add RS members
-        exec { "exec_mongo_add_rs_member ${name}":
-          command   => "/usr/bin/mongo --host ${primary_db_ip} --quiet --eval \'rs.add(\"${name}:27017\").ok\' && echo \"exec_mongo_add_rs_member ${name}\" >> /etc/contrail/contrail_mongodb_exec.out",
-          logoutput => $contrail_logoutput,
-          returns   => 0,
-          unless    => "/bin/grep -qx \"exec_mongo_add_rs_member ${name}\" /etc/contrail/contrail_mongodb_exec.out",
-        }
-      }
+class contrail::profile::mongodb(
+      $controller_address_management = $::contrail::params::controller_address_management,
+      $database_ip_list          = $::contrail::params::openstack_ip_list,
+      $primary_db_ip             = $::contrail::params::openstack_ip_list[0],
+      $ceilometer_mongo_password = $::contrail::params::os_mongo_password,
+      $ceilometer_password       = $::contrail::params::os_ceilometer_password,
+      $ceilometer_meteringsecret = $::contrail::params::os_metering_secret,
+      $mongodb_bind_address      = $::contrail::params::host_ip,
+      $contrail_logoutput        = $::contrail::params::contrail_logoutput,
+) {
+      $mongo_slave_ip_list       = delete($database_ip_list, $primary_db_ip)
 
       class { '::mongodb::server':
             bind_ip => ['127.0.0.1', $mongodb_bind_address],
@@ -61,9 +49,11 @@
             logoutput => $contrail_logoutput,
             returns   => 0,
         } ->
-        add_rs_members {
-          $mongo_slave_ip_list:
-          primary_db_ip => $primary_db_ip,
+        exec { "exec_mongo_add_rs_member ${mongo_slave_ip_list}":
+          command   => "/usr/bin/mongo --host ${primary_db_ip} --quiet --eval \'rs.add(\"${mongo_slave_ip_list}:27017\").ok\' && echo \"exec_mongo_add_rs_member ${mongo_slave_ip_list}\" >> /etc/contrail/contrail_mongodb_exec.out",
+          logoutput => $contrail_logoutput,
+          returns   => 0,
+          unless    => "/bin/grep -qx \"exec_mongo_add_rs_member ${mongo_slave_ip_list}\" /etc/contrail/contrail_mongodb_exec.out",
         } ->
         # Verify Replica set status and members
         exec { 'exec_verify_rs_status':

contrail/environment/modules/contrail/manifests/profile/openstack/ceilometer.pp

@@ -8,7 +8,7 @@
   $region_name       = $::contrail::params::os_region,
   $mongo_password    = $::contrail::params::os_mongo_password,
   $metering_secret   = $::contrail::params::os_metering_secret,
-  $database_ip_list  = $::contrail::params::database_ip_list,
+  $database_ip_list  = $::contrail::params::openstack_ip_list,
   $internal_vip      = $::contrail::params::internal_vip,
   $analytics_node_ip = $::contrail::params::collector_ip_to_use,
   $service_password  = $::contrail::params::os_mysql_service_password,
@@ -39,7 +39,7 @@
   $auth_tenant_name = 'services'
   $auth_username = 'ceilometer'
   $telemetry_secret = $metering_secret
-  if (internal_vip!='') {
+  if ($internal_vip!='') {
     $coordination_url = join(["kazoo://", $database_ip_to_use, ':2181'])
     Class['::ceilometer']->
     ceilometer_config {

contrail/environment/modules/contrail/manifests/profile/openstack_controller.pp

@@ -117,13 +117,22 @@
         enable  => true,
       }
     }
+
     if ($enable_ceilometer) {
-      contain ::contrail::profile::mongodb
-      Class['::contrail::profile::openstack::ceilometer']->Class['::contrail::profile::mongodb']
-      class {'::contrail::profile::openstack::ceilometer' : 
-        ## NOTE: no dependency on heat, it cant be before provision
-        before => Class['::contrail::profile::openstack::heat']
+      Contrail::Lib::Report_status['openstack_started'] ->
+      Package ['contrail-openstack'] ->
+      Package['mongodb_server']
+
+      Class['::contrail::profile::mongodb'] ->
+      Class['::contrail::profile::openstack::ceilometer']
+
+      Contrail::Lib::Report_status['openstack_started'] ->
+      Class['::Mongodb::Server']
+
+      class {'::contrail::profile::openstack::ceilometer' :
+        before => Contrail::Lib::Report_status['openstack_completed']
       }
+      contain ::contrail::profile::mongodb
       contain ::contrail::profile::openstack::ceilometer
     }
 
@@ -151,6 +160,8 @@
       contain ::contrail::rabbitmq
       Package['contrail-openstack'] -> Class['::contrail::rabbitmq'] -> Class['::contrail::profile::openstack::cinder']
     }
+
+
   } elsif ((!('openstack' in $host_roles)) and ($contrail_roles['openstack'] == true)) {
     contain ::contrail::uninstall_openstack
   }