Set default values for parameters in designate::api class
Change-Id: Ie8bf890f5914d418bfbee4a58aaf1d831de15507 Closes-Bug: 1654388
This commit is contained in:
parent
116c3c319b
commit
cd30cfaf01
|
@ -22,20 +22,20 @@
|
|||
#
|
||||
# [*auth_strategy*]
|
||||
# (optional) Authentication strategy to use, can be either "noauth" or
|
||||
# "keystone"
|
||||
# Defaults to 'noauth'
|
||||
# "keystone".
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*enable_api_v1*]
|
||||
# (optional) Enable Designate API Version 1
|
||||
# Defaults to true
|
||||
# (optional) Enable Designate API Version 1 (deprecated).
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*enable_api_v2*]
|
||||
# (optional) Enable Designate API Version 2 (experimental)
|
||||
# Defaults to false
|
||||
# (optional) Enable Designate API Version 2.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*enable_api_admin*]
|
||||
# (optional) Enable Designate Admin API
|
||||
# Defaults to false.
|
||||
# (optional) Enable Designate Admin API.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*api_base_uri*]
|
||||
# Set the base URI of the Designate API service.
|
||||
|
@ -75,10 +75,10 @@ class designate::api (
|
|||
$api_package_name = $::designate::params::api_package_name,
|
||||
$enabled = true,
|
||||
$service_ensure = 'running',
|
||||
$auth_strategy = 'noauth',
|
||||
$enable_api_v1 = true,
|
||||
$enable_api_v2 = false,
|
||||
$enable_api_admin = false,
|
||||
$auth_strategy = $::os_service_default,
|
||||
$enable_api_v1 = $::os_service_default,
|
||||
$enable_api_v2 = $::os_service_default,
|
||||
$enable_api_admin = $::os_service_default,
|
||||
$api_base_uri = $::os_service_default,
|
||||
$listen = $::os_service_default,
|
||||
$workers = $::os_service_default,
|
||||
|
@ -99,6 +99,10 @@ class designate::api (
|
|||
$listen_real = $listen
|
||||
}
|
||||
|
||||
if !is_service_default($enable_api_v1) {
|
||||
warning('Version 1 of API is deprecated.')
|
||||
}
|
||||
|
||||
# API Service
|
||||
designate_config {
|
||||
'service:api/listen' : value => $listen_real;
|
||||
|
|
|
@ -32,10 +32,10 @@ describe 'designate::api' do
|
|||
end
|
||||
|
||||
it 'configures designate-api with default parameters' do
|
||||
is_expected.to contain_designate_config('service:api/auth_strategy').with_value('noauth')
|
||||
is_expected.to contain_designate_config('service:api/enable_api_v1').with_value(true)
|
||||
is_expected.to contain_designate_config('service:api/enable_api_v2').with_value(false)
|
||||
is_expected.to contain_designate_config('service:api/enable_api_admin').with_value(false)
|
||||
is_expected.to contain_designate_config('service:api/auth_strategy').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_designate_config('service:api/enable_api_v1').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_designate_config('service:api/enable_api_v2').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_designate_config('service:api/enable_api_admin').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_designate_config('service:api/api_base_uri').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_designate_config('service:api/listen').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_designate_config('service:api/workers').with_value('<SERVICE DEFAULT>')
|
||||
|
|
Loading…
Reference in New Issue