Skip to content

Commit

Permalink
SM-Ceilomter: user-domain-name/project_domain_name are only for mitaka.
Browse files Browse the repository at this point in the history
Closes-Bug: #1666422

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

Change-Id: I5dfd7723cfb85ea41c5025b108972179dc9298bc
  • Loading branch information
Dheeraj Gautam committed Feb 21, 2017
1 parent a94ff6c commit ef8c7e6
Showing 1 changed file with 17 additions and 7 deletions.
24 changes: 17 additions & 7 deletions contrail/environment/modules/contrail/manifests/profile/compute.pp
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit ef8c7e6

Please sign in to comment.