Merge "Configure *_domain_name to Default by default"
This commit is contained in:
commit
c7ddfe7bf4
|
@ -224,7 +224,7 @@
|
||||||
# [*vendordata_dynamic_auth_project_domain_name*]
|
# [*vendordata_dynamic_auth_project_domain_name*]
|
||||||
# (optional) Project domain name for the vendordata dynamic plugin
|
# (optional) Project domain name for the vendordata dynamic plugin
|
||||||
# credentials.
|
# credentials.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to 'Default'
|
||||||
#
|
#
|
||||||
# [*vendordata_dynamic_auth_project_name*]
|
# [*vendordata_dynamic_auth_project_name*]
|
||||||
# (optional) Project name for the vendordata dynamic plugin credentials.
|
# (optional) Project name for the vendordata dynamic plugin credentials.
|
||||||
|
@ -232,7 +232,7 @@
|
||||||
#
|
#
|
||||||
# [*vendordata_dynamic_auth_user_domain_name*]
|
# [*vendordata_dynamic_auth_user_domain_name*]
|
||||||
# (optional) User domain name for the vendordata dynamic plugin credentials.
|
# (optional) User domain name for the vendordata dynamic plugin credentials.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to 'Default'
|
||||||
#
|
#
|
||||||
# [*vendordata_dynamic_auth_username*]
|
# [*vendordata_dynamic_auth_username*]
|
||||||
# (optional) User name for the vendordata dynamic plugin credentials.
|
# (optional) User name for the vendordata dynamic plugin credentials.
|
||||||
|
@ -323,9 +323,9 @@ class nova::api(
|
||||||
$vendordata_dynamic_auth_auth_url = $::os_service_default,
|
$vendordata_dynamic_auth_auth_url = $::os_service_default,
|
||||||
$vendordata_dynamic_auth_os_region_name = $::os_service_default,
|
$vendordata_dynamic_auth_os_region_name = $::os_service_default,
|
||||||
$vendordata_dynamic_auth_password = $::os_service_default,
|
$vendordata_dynamic_auth_password = $::os_service_default,
|
||||||
$vendordata_dynamic_auth_project_domain_name = $::os_service_default,
|
$vendordata_dynamic_auth_project_domain_name = 'Default',
|
||||||
$vendordata_dynamic_auth_project_name = $::os_service_default,
|
$vendordata_dynamic_auth_project_name = $::os_service_default,
|
||||||
$vendordata_dynamic_auth_user_domain_name = $::os_service_default,
|
$vendordata_dynamic_auth_user_domain_name = 'Default',
|
||||||
$vendordata_dynamic_auth_username = $::os_service_default,
|
$vendordata_dynamic_auth_username = $::os_service_default,
|
||||||
# DEPRECATED PARAMETER
|
# DEPRECATED PARAMETER
|
||||||
$conductor_workers = undef,
|
$conductor_workers = undef,
|
||||||
|
|
|
@ -21,12 +21,12 @@
|
||||||
# Defaults to 'services'
|
# Defaults to 'services'
|
||||||
#
|
#
|
||||||
# [*user_domain_name*]
|
# [*user_domain_name*]
|
||||||
# (Optional) Name of domain for $username
|
# (Optional) Name of domain for $user_domain_name
|
||||||
# Defaults to $::os_service_default
|
# Defaults to 'Default'
|
||||||
#
|
#
|
||||||
# [*project_domain_name*]
|
# [*project_domain_name*]
|
||||||
# (Optional) Name of domain for $project_name
|
# (Optional) Name of domain for $project_domain_name
|
||||||
# Defaults to $::os_service_default
|
# Defaults to 'Default'
|
||||||
#
|
#
|
||||||
# [*insecure*]
|
# [*insecure*]
|
||||||
# (Optional) If true, explicitly allow TLS without checking server cert
|
# (Optional) If true, explicitly allow TLS without checking server cert
|
||||||
|
@ -183,8 +183,8 @@ class nova::keystone::authtoken(
|
||||||
$password = $::os_service_default,
|
$password = $::os_service_default,
|
||||||
$auth_url = 'http://127.0.0.1:35357/',
|
$auth_url = 'http://127.0.0.1:35357/',
|
||||||
$project_name = 'services',
|
$project_name = 'services',
|
||||||
$user_domain_name = $::os_service_default,
|
$user_domain_name = 'Default',
|
||||||
$project_domain_name = $::os_service_default,
|
$project_domain_name = 'Default',
|
||||||
$insecure = $::os_service_default,
|
$insecure = $::os_service_default,
|
||||||
$auth_section = $::os_service_default,
|
$auth_section = $::os_service_default,
|
||||||
$auth_type = 'password',
|
$auth_type = 'password',
|
||||||
|
|
|
@ -21,12 +21,12 @@
|
||||||
# Defaults to 'services'
|
# Defaults to 'services'
|
||||||
#
|
#
|
||||||
# [*user_domain_name*]
|
# [*user_domain_name*]
|
||||||
# (Optional) Name of domain for $username
|
# (Optional) Name of domain for $user_domain_name
|
||||||
# Defaults to $::os_service_default
|
# Defaults to 'Default'
|
||||||
#
|
#
|
||||||
# [*project_domain_name*]
|
# [*project_domain_name*]
|
||||||
# (Optional) Name of domain for $project_name
|
# (Optional) Name of domain for $project_domain_name
|
||||||
# Defaults to $::os_service_default
|
# Defaults to 'Default'
|
||||||
#
|
#
|
||||||
# [*insecure*]
|
# [*insecure*]
|
||||||
# (Optional) If true, explicitly allow TLS without checking server cert
|
# (Optional) If true, explicitly allow TLS without checking server cert
|
||||||
|
@ -183,8 +183,8 @@ class nova::metadata::novajoin::authtoken(
|
||||||
$password = $::os_service_default,
|
$password = $::os_service_default,
|
||||||
$auth_url = 'http://127.0.0.1:35357/',
|
$auth_url = 'http://127.0.0.1:35357/',
|
||||||
$project_name = 'services',
|
$project_name = 'services',
|
||||||
$user_domain_name = $::os_service_default,
|
$user_domain_name = 'Default',
|
||||||
$project_domain_name = $::os_service_default,
|
$project_domain_name = 'Default',
|
||||||
$insecure = $::os_service_default,
|
$insecure = $::os_service_default,
|
||||||
$auth_section = $::os_service_default,
|
$auth_section = $::os_service_default,
|
||||||
$auth_type = 'password',
|
$auth_type = 'password',
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
issues:
|
||||||
|
- |
|
||||||
|
Keystone v2.0 API was removed so we need to set a default value
|
||||||
|
for user_domain_name and project_domain name, which will be
|
||||||
|
Default as it is already in some other classes in modules.
|
|
@ -75,9 +75,9 @@ describe 'nova::api' do
|
||||||
is_expected.to contain_nova_config('vendordata_dynamic_auth/auth_url').with('value' => '<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('vendordata_dynamic_auth/auth_url').with('value' => '<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('vendordata_dynamic_auth/os_region_name').with('value' => '<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('vendordata_dynamic_auth/os_region_name').with('value' => '<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('vendordata_dynamic_auth/password').with('value' => '<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('vendordata_dynamic_auth/password').with('value' => '<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('vendordata_dynamic_auth/project_domain_name').with('value' => '<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('vendordata_dynamic_auth/project_domain_name').with('value' => 'Default')
|
||||||
is_expected.to contain_nova_config('vendordata_dynamic_auth/project_name').with('value' => '<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('vendordata_dynamic_auth/project_name').with('value' => '<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('vendordata_dynamic_auth/user_domain_name').with('value' => '<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('vendordata_dynamic_auth/user_domain_name').with('value' => 'Default')
|
||||||
is_expected.to contain_nova_config('vendordata_dynamic_auth/username').with('value' => '<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('vendordata_dynamic_auth/username').with('value' => '<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -15,8 +15,8 @@ describe 'nova::keystone::authtoken' do
|
||||||
is_expected.to contain_nova_config('keystone_authtoken/password').with_value('nova_password')
|
is_expected.to contain_nova_config('keystone_authtoken/password').with_value('nova_password')
|
||||||
is_expected.to contain_nova_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357/')
|
is_expected.to contain_nova_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357/')
|
||||||
is_expected.to contain_nova_config('keystone_authtoken/project_name').with_value('services')
|
is_expected.to contain_nova_config('keystone_authtoken/project_name').with_value('services')
|
||||||
is_expected.to contain_nova_config('keystone_authtoken/user_domain_name').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('keystone_authtoken/user_domain_name').with_value('Default')
|
||||||
is_expected.to contain_nova_config('keystone_authtoken/project_domain_name').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('keystone_authtoken/project_domain_name').with_value('Default')
|
||||||
is_expected.to contain_nova_config('keystone_authtoken/insecure').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('keystone_authtoken/insecure').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('keystone_authtoken/auth_section').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('keystone_authtoken/auth_section').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('keystone_authtoken/auth_type').with_value('password')
|
is_expected.to contain_nova_config('keystone_authtoken/auth_type').with_value('password')
|
||||||
|
|
|
@ -15,8 +15,8 @@ describe 'nova::metadata::novajoin::authtoken' do
|
||||||
is_expected.to contain_novajoin_config('keystone_authtoken/password').with_value('novajoin_password')
|
is_expected.to contain_novajoin_config('keystone_authtoken/password').with_value('novajoin_password')
|
||||||
is_expected.to contain_novajoin_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357/')
|
is_expected.to contain_novajoin_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357/')
|
||||||
is_expected.to contain_novajoin_config('keystone_authtoken/project_name').with_value('services')
|
is_expected.to contain_novajoin_config('keystone_authtoken/project_name').with_value('services')
|
||||||
is_expected.to contain_novajoin_config('keystone_authtoken/user_domain_name').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_novajoin_config('keystone_authtoken/user_domain_name').with_value('Default')
|
||||||
is_expected.to contain_novajoin_config('keystone_authtoken/project_domain_name').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_novajoin_config('keystone_authtoken/project_domain_name').with_value('Default')
|
||||||
is_expected.to contain_novajoin_config('keystone_authtoken/insecure').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_novajoin_config('keystone_authtoken/insecure').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_novajoin_config('keystone_authtoken/auth_section').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_novajoin_config('keystone_authtoken/auth_section').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_novajoin_config('keystone_authtoken/auth_type').with_value('password')
|
is_expected.to contain_novajoin_config('keystone_authtoken/auth_type').with_value('password')
|
||||||
|
|
Loading…
Reference in New Issue