From eb2adafcd2e199516f67aaeb137c3ed6f9d0c06d Mon Sep 17 00:00:00 2001
From: Dheeraj Gautam <dgautam@juniper.net>
Date: Wed, 8 Feb 2017 16:19:20 -0800
Subject: [PATCH] Fix ceilometer errors while provisioning.

Partial-Bug: #1662790

1. tested kilo provisioning
2. tested mitaka provisioning

Change-Id: I654d1158f3815d2be9665ccf6e39a8b45e39cf24
---
 .../manifests/profile/openstack/ceilometer.pp | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/contrail/environment/modules/contrail/manifests/profile/openstack/ceilometer.pp b/contrail/environment/modules/contrail/manifests/profile/openstack/ceilometer.pp
index 72461cec..559751f4 100644
--- a/contrail/environment/modules/contrail/manifests/profile/openstack/ceilometer.pp
+++ b/contrail/environment/modules/contrail/manifests/profile/openstack/ceilometer.pp
@@ -75,18 +75,6 @@
     'database/time_to_live'      : value => '7200';
     'publisher/telemetry_secret' : value => $metering_secret;
     'DEFAULT/auth_strategy'      : value => 'keystone';
-    'service_credentials/os_auth_url' : value => $auth_url;
-    'service_credentials/os_username' : value => $auth_username;
-    'service_credentials/os_password' : value => $auth_password;
-    'service_credentials/os_tenant_name' : value => $auth_tenant_name;
-  } ->
-  class { '::ceilometer::agent::auth':
-    auth_url         => $auth_url,
-    auth_password    => $auth_password,
-    auth_tenant_name => $auth_tenant_name,
-    auth_user        => $auth_username,
-    auth_project_domain_name => $domain_name,
-    auth_user_domain_name => $domain_name
   } ->
   class { '::ceilometer::agent::central':
     coordination_url => $coordination_url
@@ -109,16 +97,36 @@
         keystone_password => $ceilometer_password,
         keystone_tenant   => $auth_tenant_name,
       }
+  class { '::ceilometer::agent::auth':
+    auth_url         => $auth_url,
+    auth_password    => $auth_password,
+    auth_tenant_name => $auth_tenant_name,
+    auth_user        => $auth_username,
+    auth_project_domain_name => $domain_name,
+    auth_user_domain_name => $domain_name
+  }
+  ceilometer_config {
+    'service_credentials/os_auth_url' : value => $auth_url;
+    'service_credentials/os_username' : value => $auth_username;
+    'service_credentials/os_password' : value => $auth_password;
+    'service_credentials/os_tenant_name' : value => $auth_tenant_name;
+  }
     }
 
     default: {
       class { '::ceilometer::api':
         enabled           => true,
-        auth_uri          => $auth_uri,
+        keystone_auth_uri => $auth_uri,
         keystone_host     => $keystone_ip_to_use,
         keystone_password => $ceilometer_password,
         keystone_tenant   => $auth_tenant_name,
       }
+  class { '::ceilometer::agent::auth':
+    auth_url         => $auth_url,
+    auth_password    => $auth_password,
+    auth_tenant_name => $auth_tenant_name,
+    auth_user        => $auth_username,
+  }
     }
   }
   if $::osfamily != 'Debian' {