openstack
/
puppet-glance
Code Issues Proposed changes

Refactorise Keystone resources management 

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

Change-Id: If15a56de62d5d87d456cdc6aed1602aee5984124
Implements: blueprint common-openstack-identity-resource
This commit is contained in:
Emilien Macchi 2014-11-19 23:29:36 -05:00
parent 916a90ebdc
commit ac5c2bcf66
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
manifests/keystone/auth.pp
View File

@ -49,37 +49,25 @@ class glance::keystone::auth(
Keystone_endpoint["${region}/${real_service_name}"] ~> Service <| name == 'glance-api' |>
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 Image Service',
service_name => $real_service_name,
region => $region,
password => $password,
email => $email,
tenant => $tenant,
public_url => "${public_protocol}://${public_address}:${port}",
admin_url => "${admin_protocol}://${admin_address}:${port}",
internal_url => "${internal_protocol}://${internal_address}:${port}",
}
if $configure_user_role {
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'glance-registry' |>
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'glance-api' |>
keystone_user_role { "${auth_name}@${tenant}":
ensure => present,
roles => 'admin',
}
}
keystone_service { $real_service_name:
ensure => present,
type => $service_type,
description => 'Openstack Image Service',
}
if $configure_endpoint {
keystone_endpoint { "${region}/${real_service_name}":
ensure => present,
public_url => "${public_protocol}://${public_address}:${port}",
admin_url => "${admin_protocol}://${admin_address}:${port}",
internal_url => "${internal_protocol}://${internal_address}:${port}",
}
}
}