openstack/puppet-keystone
Code Issues Proposed changes

Validate service_identity resources

Browse Source 
* When creating an user, show a warning if no password has been set.
* When creating a service, validate that a service_type is set.
* When creating endpoints, validate *_url are set.

It avoid catalog failures if a parameter is missing.

Change-Id: Ibe6c467a875bbdb09faad91d7ee39edf35e30624
This commit is contained in:
Emilien Macchi 2015-06-10 00:19:54 -04:00
parent f654d3cd9b
commit a41504d2df
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
manifests/resource/service_identity.pp
View File

@ -156,6 +156,9 @@ define keystone::resource::service_identity(
'ignore_default_tenant' => $ignore_default_tenant, 'ignore_default_tenant' => $ignore_default_tenant,
'domain' => $user_domain_real, 'domain' => $user_domain_real,
}) })
if ! $password {
warning("No password had been set for ${auth_name} user.")
}
} }
if $configure_user_role { if $configure_user_role {
@ -166,19 +169,27 @@ define keystone::resource::service_identity(
} }
if $configure_service { if $configure_service {
ensure_resource('keystone_service', $service_name_real, { if $service_type {
'ensure' => 'present', ensure_resource('keystone_service', $service_name_real, {
'type' => $service_type, 'ensure' => 'present',
'description' => $service_description, 'type' => $service_type,
}) 'description' => $service_description,
})
} else {
fail ('When configuring a service, you need to set the service_type parameter.')
}
} }
if $configure_endpoint { if $configure_endpoint {
ensure_resource('keystone_endpoint', "${region}/${service_name_real}", { if $public_url and $admin_url and $internal_url {
'ensure' => 'present', ensure_resource('keystone_endpoint', "${region}/${service_name_real}", {
'public_url' => $public_url, 'ensure' => 'present',
'admin_url' => $admin_url, 'public_url' => $public_url,
'internal_url' => $internal_url, 'admin_url' => $admin_url,
}) 'internal_url' => $internal_url,
})
} else {
fail ('When configuring an endpoint, you need to set the _url parameters.')
}
} }
} }

15
spec/defines/keystone_resource_service_identity_spec.rb
View File

@ -62,11 +62,20 @@ describe 'keystone::resource::service_identity' do
)} )}
end end
context 'when omitting a required parameter password' do context 'when trying to create a service without service_type' do
let :params do let :params do
required_params.delete(:password) required_params.delete(:service_type)
required_params
end end
it { expect { is_expected.to raise_error(Puppet::Error) } } it_raises 'a Puppet::Error', /When configuring a service, you need to set the service_type parameter/
end
context 'when trying to create an endpoint without url' do
let :params do
required_params.delete(:public_url)
required_params
end
it_raises 'a Puppet::Error', /When configuring an endpoint, you need to set the _url parameters/
end end
context 'with user domain' do context 'with user domain' do