Add support for [nova] api_micro_version
Manila provides the api_micro_version for Nova and Glance but currently the parameter is implemented for only Glance. This change adds the parameter to the nova class so that api version can be defined for both of these two services. Change-Id: I6ab2257febe68eff05c0a1ea903ab84e3292f4ee
This commit is contained in:
parent
ba2c17d64e
commit
684fe638de
@ -50,6 +50,10 @@
|
||||
# (optional) User's password
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*api_microversion*]
|
||||
# (optional) Version of Nova API to be used
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
class manila::compute::nova (
|
||||
$insecure = $::os_service_default,
|
||||
$auth_url = $::os_service_default,
|
||||
@ -62,6 +66,7 @@ class manila::compute::nova (
|
||||
$endpoint_type = $::os_service_default,
|
||||
$username = 'nova',
|
||||
$password = $::os_service_default,
|
||||
$api_microversion = $::os_service_default,
|
||||
) {
|
||||
|
||||
include manila::deps
|
||||
@ -78,5 +83,6 @@ class manila::compute::nova (
|
||||
'nova/password': value => $password, secret => true;
|
||||
'nova/project_name': value => $project_name;
|
||||
'nova/project_domain_name': value => $project_domain_name;
|
||||
'nova/api_microversion': value => $api_microversion;
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,5 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
The new ``manila::compute::nova::api_micro_version`` parameter has been
|
||||
added.
|
@ -15,20 +15,22 @@ describe 'manila::compute::nova' do
|
||||
is_expected.to contain_manila_config('nova/endpoint_type').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_manila_config('nova/username').with_value('nova')
|
||||
is_expected.to contain_manila_config('nova/password').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_manila_config('nova/api_microversion').with_value('<SERVICE DEFAULT>')
|
||||
end
|
||||
end
|
||||
|
||||
context 'with overridden parameters' do
|
||||
let :params do
|
||||
{
|
||||
:insecure => true,
|
||||
:auth_url => 'http://127.0.0.2:5000/',
|
||||
:auth_type => 'v3password',
|
||||
:cafile => '/etc/ssl/certs/ca.crt',
|
||||
:region_name => 'RegionOne',
|
||||
:endpoint_type => 'publicURL',
|
||||
:username => 'novav1',
|
||||
:password => '123123',
|
||||
:insecure => true,
|
||||
:auth_url => 'http://127.0.0.2:5000/',
|
||||
:auth_type => 'v3password',
|
||||
:cafile => '/etc/ssl/certs/ca.crt',
|
||||
:region_name => 'RegionOne',
|
||||
:endpoint_type => 'publicURL',
|
||||
:username => 'novav1',
|
||||
:password => '123123',
|
||||
:api_microversion => '2.10'
|
||||
}
|
||||
end
|
||||
|
||||
@ -44,6 +46,7 @@ describe 'manila::compute::nova' do
|
||||
is_expected.to contain_manila_config('nova/endpoint_type').with_value('publicURL')
|
||||
is_expected.to contain_manila_config('nova/username').with_value('novav1')
|
||||
is_expected.to contain_manila_config('nova/password').with_value('123123').with_secret(true)
|
||||
is_expected.to contain_manila_config('nova/api_microversion').with_value('2.10')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Loading…
x
Reference in New Issue
Block a user