openstack
/
puppet-nova
Code Issues Proposed changes

Provide default service_name for keystone endpoint 

This change updates the nova::keystone::auth class to include a
default service_name of 'nova' so that if a user changes the
auth_name, the service is still created as being related to 'nova'.

Change-Id: Iaf616a094bd2192fe0149307065cec11038d8c85
Closes-Bug: #1590040
This commit is contained in:
Juan Antonio Osorio Robles 2016-06-08 08:38:07 +03:00
parent ec3cad738b
commit 96ec7b5bec
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/keystone/auth.pp
View File

@ -13,7 +13,7 @@
# #
# [*service_name*] # [*service_name*]
# (optional) Name of the service. # (optional) Name of the service.
# Defaults to the value of auth_name. # Defaults to 'nova'.
# #
# [*service_description*] # [*service_description*]
# (optional) Description for keystone service. # (optional) Description for keystone service.
@ -88,7 +88,7 @@
class nova::keystone::auth( class nova::keystone::auth(
$password, $password,
$auth_name = 'nova', $auth_name = 'nova',
$service_name = undef, $service_name = 'nova',
$service_description = 'Openstack Compute Service', $service_description = 'Openstack Compute Service',
$region = 'RegionOne', $region = 'RegionOne',
$tenant = 'services', $tenant = 'services',
@ -115,25 +115,17 @@ class nova::keystone::auth(
warning('all parameters related to v3 API in nova::keystone::auth are deprecated, have no effect and will be removed after Newton release.') warning('all parameters related to v3 API in nova::keystone::auth are deprecated, have no effect and will be removed after Newton release.')
} }
# TODO(mmagr): change default service names according to default_catalog in next (M) cycle
if $service_name == undef {
$real_service_name = $auth_name
warning('Note that service_name parameter default value will be changed to "Compute Service" (according to Keystone default catalog) in a future release. In case you use different value, please update your manifests accordingly.')
} else {
$real_service_name = $service_name
}
if $configure_endpoint { if $configure_endpoint {
Keystone_endpoint["${region}/${real_service_name}::compute"] ~> Service <| name == 'nova-api' |> Keystone_endpoint["${region}/${service_name}::compute"] ~> Service <| name == 'nova-api' |>
} }
keystone::resource::service_identity { "nova service, user ${auth_name}": keystone::resource::service_identity { 'nova':
configure_user => $configure_user, configure_user => $configure_user,
configure_user_role => $configure_user_role, configure_user_role => $configure_user_role,
configure_endpoint => $configure_endpoint, configure_endpoint => $configure_endpoint,
service_type => 'compute', service_type => 'compute',
service_description => $service_description, service_description => $service_description,
service_name => $real_service_name, service_name => $service_name,
region => $region, region => $region,
auth_name => $auth_name, auth_name => $auth_name,
password => $password, password => $password,

5
releasenotes/notes/keystone-auth-name-211cfa37fbe78c8c.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- The keystone auth class has been updated to provide a default service_name
to allow a user to specify a custom auth_name that may not contain the
name of the service.

3
spec/classes/nova_keystone_auth_spec.rb
View File

@ -8,6 +8,7 @@ describe 'nova::keystone::auth' do
let :default_params do let :default_params do
{ :auth_name => 'nova', { :auth_name => 'nova',
:service_name => 'nova',
:region => 'RegionOne', :region => 'RegionOne',
:tenant => 'services', :tenant => 'services',
:email => 'nova@localhost', :email => 'nova@localhost',
@ -57,7 +58,7 @@ describe 'nova::keystone::auth' do
:roles => ['admin'] :roles => ['admin']
)} )}
it { is_expected.to contain_keystone_service('foo::compute').with( it { is_expected.to contain_keystone_service('nova::compute').with(
:ensure => 'present', :ensure => 'present',
:description => 'Openstack Compute Service' :description => 'Openstack Compute Service'
)} )}