openstack/puppet-swift
Code Issues Proposed changes

Merge "Refactorise Keystone resources management"

Browse Source
This commit is contained in:
Jenkins 2014-12-03 22:27:06 +00:00 committed by Gerrit Code Review
commit a69a506df0
2 changed files with 25 additions and 39 deletions
manifests/keystone
auth.pp
spec/classes
swift_keystone_auth_spec.rb

63
manifests/keystone/auth.pp

@ -53,46 +53,30 @@ class swift::keystone::auth(
$real_internal_address = $internal_address
}
keystone_user { $auth_name:
ensure => present,
password => $password,
email => $email,
tenant => $tenant,
}
keystone_user_role { "${auth_name}@${tenant}":
ensure => present,
roles => 'admin',
require => Keystone_user[$auth_name]
keystone::resource::service_identity { $auth_name:
configure_endpoint => $configure_endpoint,
service_type => 'object-store',
service_description => 'Openstack Object-Store Service',
region => $region,
password => $password,
email => $email,
tenant => $tenant,
public_url => "${public_protocol}://${public_address}:${real_public_port}/v1/${endpoint_prefix}_%(tenant_id)s",
admin_url => "${admin_protocol}://${real_admin_address}:${port}/",
internal_url => "${internal_protocol}://${real_internal_address}:${port}/v1/${endpoint_prefix}_%(tenant_id)s",
}
keystone_service { $auth_name:
ensure => present,
type => 'object-store',
description => 'Openstack Object-Store Service',
}
if $configure_endpoint {
keystone_endpoint { "${region}/${auth_name}":
ensure => present,
public_url => "${public_protocol}://${public_address}:${real_public_port}/v1/${endpoint_prefix}_%(tenant_id)s",
admin_url => "${admin_protocol}://${real_admin_address}:${port}/",
internal_url => "${internal_protocol}://${real_internal_address}:${port}/v1/${endpoint_prefix}_%(tenant_id)s",
}
}
if $configure_s3_endpoint {
keystone_service { "${auth_name}_s3":
ensure => present,
type => 's3',
description => 'Openstack S3 Service',
}
keystone_endpoint { "${region}/${auth_name}_s3":
ensure => present,
public_url => "${public_protocol}://${public_address}:${real_public_port}",
admin_url => "${admin_protocol}://${real_admin_address}:${port}",
internal_url => "${internal_protocol}://${real_internal_address}:${port}",
}
keystone::resource::service_identity { "${auth_name}_s3":
configure_user => false,
configure_user_role => false,
configure_endpoint => $configure_s3_endpoint,
configure_service => $configure_s3_endpoint,
service_type => 's3',
service_description => 'Openstack S3 Service',
region => $region,
public_url => "${public_protocol}://${public_address}:${real_public_port}",
admin_url => "${admin_protocol}://${real_admin_address}:${port}",
internal_url => "${internal_protocol}://${real_internal_address}:${port}",
}
if $operator_roles {
@ -100,4 +84,7 @@ class swift::keystone::auth(
ensure_resource('keystone_role', $operator_roles, { 'ensure' => 'present' })
}
# Backward compatibility
Keystone_user["$auth_name"] -> Keystone_user_role["${auth_name}@${tenant}"]
}

1
spec/classes/swift_keystone_auth_spec.rb

@ -94,7 +94,6 @@ describe 'swift::keystone::auth' do
it { should contain_keystone_user_role("#{p[:auth_name]}@#{p[:tenant]}").with(
:ensure => 'present',
:roles => 'admin',
:require => "Keystone_user[#{p[:auth_name]}]"
)}
it { should contain_keystone_service(p[:auth_name]).with(