openstack/puppet-ceilometer
Code Issues Proposed changes

Refactorise Keystone resources management

Browse Source 
Refactorise the code of Keystone resources management with backward
compatibility since we don't modify the unit tests.

Change-Id: Iafbe248ef0314b8abc31d22a7631df51e23f2c48
Implements: blueprint common-openstack-identity-resource
This commit is contained in:
Emilien Macchi 2014-11-21 10:06:47 -05:00
parent 1d78470e50
commit c0318f0e1b
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
manifests/keystone/auth.pp
View File

@ -125,43 +125,32 @@ class ceilometer::keystone::auth (
$real_service_name = $auth_name
}
if $configure_user {
keystone_user { $auth_name:
ensure => present,
password => $password,
email => $email,
tenant => $tenant,
}
keystone::resource::service_identity { $auth_name:
configure_user => $configure_user,
configure_user_role => $configure_user_role,
configure_endpoint => $configure_endpoint,
service_type => $service_type,
service_description => 'Openstack Metering Service',
service_name => $real_service_name,
region => $region,
password => $password,
email => $email,
tenant => $tenant,
roles => ['admin', 'ResellerAdmin'],
public_url => $public_url_real,
admin_url => $admin_url_real,
internal_url => $internal_url_real,
}
if $configure_user_role {
Keystone_user_role["${auth_name}@${tenant}"] ~>
Service <| name == 'ceilometer-api' |>
if !defined(Keystone_role['ResellerAdmin']) {
keystone_role { 'ResellerAdmin':
ensure => present,
}
}
keystone_user_role { "${auth_name}@${tenant}":
ensure => present,
roles => ['admin', 'ResellerAdmin'],
require => Keystone_role['ResellerAdmin'],
}
Keystone_role['ResellerAdmin'] -> Keystone_user_role["${auth_name}@${tenant}"] ~>
Service <| name == 'ceilometer-api' |>
}
keystone_service { $real_service_name:
ensure => present,
type => $service_type,
description => 'Openstack Metering Service',
}
if $configure_endpoint {
keystone_endpoint { "${region}/${real_service_name}":
ensure => present,
public_url => $public_url_real,
admin_url => $admin_url_real,
internal_url => $internal_url_real,
}
}
}