openstack
/
puppet-ironic
Code Issues Proposed changes

keystone/auth: make service description configurable 

This commit adds the service description as a class parameter in order to allow
users to update from a previous version if the service description is changed
(incorrectly spelled or wrong description).

This commit also fix the Ironic service description, 'Ironic Networking Service'
seems to be a too quick sed of a neutron manifest.

Closes-Bug: #1468407
Change-Id: I8ad187ae171b6e6c9841b18012a04a504ca75c5f
This commit is contained in:
Sebastien Badia 2015-05-22 10:39:36 -07:00
parent 00ed9a00ab
commit 960baa08d5
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/keystone/auth.pp
View File

@ -51,6 +51,10 @@
# [*service_type*]
# Type of service. Defaults to 'baremetal'.
#
# [*service_description*]
# (Optional) Description for keystone service.
# Defaults to 'Ironic Bare Metal Provisioning Service'.
#
# [*region*]
# Region for endpoint. Defaults to 'RegionOne'.
#
@ -119,6 +123,7 @@ class ironic::keystone::auth (
$configure_user_role = true,
$service_name = undef,
$service_type = 'baremetal',
$service_description = 'Ironic Bare Metal Provisioning Service',
$public_protocol = 'http',
$region = 'RegionOne',
$public_url = 'http://127.0.0.1:6385',
@ -196,7 +201,7 @@ class ironic::keystone::auth (
configure_endpoint => $configure_endpoint,
service_name => $real_service_name,
service_type => $service_type,
service_description => 'Ironic Networking Service',
service_description => $service_description,
region => $region,
password => $password,
email => $email,

6
spec/classes/ironic_keystone_auth_spec.rb
View File

@ -46,7 +46,7 @@ describe 'ironic::keystone::auth' do
it { is_expected.to contain_keystone_service('ironic').with(
:ensure => 'present',
:type => 'baremetal',
:description => 'Ironic Networking Service'
:description => 'Ironic Bare Metal Provisioning Service'
) }
it { is_expected.to contain_keystone_endpoint('RegionOne/ironic').with(
@ -147,7 +147,7 @@ describe 'ironic::keystone::auth' do
it { is_expected.to contain_keystone_service('ironic').with(
:ensure => 'present',
:type => 'baremetal',
:description => 'Ironic Networking Service'
:description => 'Ironic Bare Metal Provisioning Service'
) }
end
@ -169,7 +169,7 @@ describe 'ironic::keystone::auth' do
it { is_expected.to contain_keystone_service('ironic').with(
:ensure => 'present',
:type => 'baremetal',
:description => 'Ironic Networking Service'
:description => 'Ironic Bare Metal Provisioning Service'
) }
end