From ef8c7e66223b3ebcaade2320566dbea6ff901eb1 Mon Sep 17 00:00:00 2001
From: Dheeraj Gautam <dgautam@juniper.net>
Date: Mon, 20 Feb 2017 23:12:47 -0800
Subject: [PATCH] SM-Ceilomter: user-domain-name/project_domain_name are only
 for mitaka.

Closes-Bug: #1666422

1. call ceilometer::agent::auth differently for mitaka/kilo-liberty

Change-Id: I5dfd7723cfb85ea41c5025b108972179dc9298bc
---
 .../contrail/manifests/profile/compute.pp     | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/contrail/environment/modules/contrail/manifests/profile/compute.pp b/contrail/environment/modules/contrail/manifests/profile/compute.pp
index b352c40d..0cdca5b6 100644
--- a/contrail/environment/modules/contrail/manifests/profile/compute.pp
+++ b/contrail/environment/modules/contrail/manifests/profile/compute.pp
@@ -21,6 +21,7 @@
   $keystone_version   = $::contrail::params::keystone_version,
   $keystone_ip_to_use = $::contrail::params::keystone_ip_to_use,
   $metering_secret    = $::contrail::params::os_metering_secret,
+  $package_sku        = $::contrail::params::package_sku,
   $ceilometer_password        = $::contrail::params::os_ceilometer_password,
   $is_there_roles_to_delete   = $::contrail::params::is_there_roles_to_delete,
   $openstack_rabbit_servers   = $::contrail::params::openstack_rabbit_hosts,
@@ -51,13 +52,22 @@
         }
       }
       class { '::ceilometer::agent::compute': }
-      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
+      if ( $package_sku =~ /13\.0/) {
+        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
+        }
+      } else {
+        class { '::ceilometer::agent::auth':
+          auth_url         => $auth_url,
+          auth_password    => $auth_password,
+          auth_tenant_name => $auth_tenant_name,
+          auth_user        => $auth_username,
+        }
       }
       ceilometer_config {
         'service_credentials/os_auth_url' : value => $auth_url;