openstack
/
puppet-nova
Code Issues Proposed changes

Configure nova/ironic with domain parameters 

Add missing domain parameters so Nova / Ironic can use Keystone v3.

Closes-Bug: #1722621
Change-Id: I449dc970db422b66511c6ee3387987cbae55aced
Depends-On: I385e2f34dd925bdc2fdbc1553d49dce104f566f2
This commit is contained in:
Emilien Macchi 2017-10-10 11:58:29 -07:00
parent 6326182ab3
commit 5d712eb64e
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/ironic/common.pp
View File

@ -48,6 +48,14 @@
# The Ironic Keystone tenant name.
# Defaults to 'services'
#
# [*user_domain_name*]
# (Optional) Name of domain for $user_domain_name
# Defaults to 'Default'
#
# [*project_domain_name*]
# (Optional) Name of domain for $project_domain_name
# Defaults to 'Default'
#
class nova::ironic::common (
$api_endpoint = 'http://127.0.0.1:6385/v1',
$auth_plugin = 'password',
@ -57,6 +65,8 @@ class nova::ironic::common (
$username = 'admin',
$api_max_retries = $::os_service_default,
$api_retry_interval = $::os_service_default,
$user_domain_name = 'Default',
$project_domain_name = 'Default',
) {
include ::nova::deps
@ -71,6 +81,8 @@ class nova::ironic::common (
'ironic/api_endpoint': value => $api_endpoint;
'ironic/api_max_retries': value => $api_max_retries;
'ironic/api_retry_interval': value => $api_retry_interval;
'ironic/user_domain_name': value => $user_domain_name;
'ironic/project_domain_name': value => $project_domain_name;
}
}

20
spec/classes/nova_ironic_common_spec.rb
View File

@ -14,6 +14,8 @@ describe 'nova::ironic::common' do
is_expected.to contain_nova_config('ironic/api_endpoint').with_value('http://127.0.0.1:6385/v1')
is_expected.to contain_nova_config('ironic/api_max_retries').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('ironic/api_retry_interval').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('ironic/user_domain_name').with_value('Default')
is_expected.to contain_nova_config('ironic/project_domain_name').with_value('Default')
end
end
@ -21,13 +23,15 @@ describe 'nova::ironic::common' do
context 'with parameters' do
let :params do
{
:username => 'ironic',
:password => 's3cr3t',
:auth_url => 'http://10.0.0.10:35357/',
:project_name => 'services2',
:api_endpoint => 'http://10.0.0.10:6385/v1',
:api_max_retries => 60,
:api_retry_interval => 2,
:username => 'ironic',
:password => 's3cr3t',
:auth_url => 'http://10.0.0.10:35357/',
:project_name => 'services2',
:api_endpoint => 'http://10.0.0.10:6385/v1',
:api_max_retries => 60,
:api_retry_interval => 2,
:user_domain_name => 'custom_domain',
:project_domain_name => 'custom_domain',
}
end
@ -40,6 +44,8 @@ describe 'nova::ironic::common' do
is_expected.to contain_nova_config('ironic/api_endpoint').with_value('http://10.0.0.10:6385/v1')
is_expected.to contain_nova_config('ironic/api_max_retries').with('value' => '60')
is_expected.to contain_nova_config('ironic/api_retry_interval').with('value' => '2')
is_expected.to contain_nova_config('ironic/user_domain_name').with('value' => 'custom_domain')
is_expected.to contain_nova_config('ironic/project_domain_name').with('value' => 'custom_domain')
end
end