Add missing endpoint_override params
After merging https://review.openstack.org/#/c/602070/ the endpoint_override param was missing in cinder, glance, neutron and swift config sections. Change-Id: Ic2f720ca50671a34f00ed7d5c118b897f795f046
This commit is contained in:
parent
b9415d8f83
commit
7a4fb04a42
|
@ -40,6 +40,10 @@
|
||||||
# The name of project's domain (required for Identity V3).
|
# The name of project's domain (required for Identity V3).
|
||||||
# Defaults to 'Default'
|
# Defaults to 'Default'
|
||||||
#
|
#
|
||||||
|
# [*endpoint_override*]
|
||||||
|
# The endpoint URL for requests for this client
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
class ironic::cinder (
|
class ironic::cinder (
|
||||||
$auth_type = 'password',
|
$auth_type = 'password',
|
||||||
$auth_url = $::os_service_default,
|
$auth_url = $::os_service_default,
|
||||||
|
@ -48,6 +52,7 @@ class ironic::cinder (
|
||||||
$password = $::os_service_default,
|
$password = $::os_service_default,
|
||||||
$user_domain_name = 'Default',
|
$user_domain_name = 'Default',
|
||||||
$project_domain_name = 'Default',
|
$project_domain_name = 'Default',
|
||||||
|
$endpoint_override = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
ironic_config {
|
ironic_config {
|
||||||
|
@ -58,5 +63,6 @@ class ironic::cinder (
|
||||||
'cinder/project_name': value => $project_name;
|
'cinder/project_name': value => $project_name;
|
||||||
'cinder/user_domain_name': value => $user_domain_name;
|
'cinder/user_domain_name': value => $user_domain_name;
|
||||||
'cinder/project_domain_name': value => $project_domain_name;
|
'cinder/project_domain_name': value => $project_domain_name;
|
||||||
|
'cinder/endpoint_override': value => $endpoint_override;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,6 +85,10 @@
|
||||||
# valid for.
|
# valid for.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
|
# [*endpoint_override*]
|
||||||
|
# The endpoint URL for requests for this client
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
class ironic::glance (
|
class ironic::glance (
|
||||||
$auth_type = 'password',
|
$auth_type = 'password',
|
||||||
$auth_url = $::os_service_default,
|
$auth_url = $::os_service_default,
|
||||||
|
@ -102,6 +106,7 @@ class ironic::glance (
|
||||||
$swift_temp_url_key = $::os_service_default,
|
$swift_temp_url_key = $::os_service_default,
|
||||||
$swift_temp_url_duration = $::os_service_default,
|
$swift_temp_url_duration = $::os_service_default,
|
||||||
$swift_account_project_name = undef,
|
$swift_account_project_name = undef,
|
||||||
|
$endpoint_override = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
if is_array($api_servers) {
|
if is_array($api_servers) {
|
||||||
|
@ -129,6 +134,7 @@ class ironic::glance (
|
||||||
'glance/swift_endpoint_url': value => $swift_endpoint_url;
|
'glance/swift_endpoint_url': value => $swift_endpoint_url;
|
||||||
'glance/swift_temp_url_key': value => $swift_temp_url_key, secret => true;
|
'glance/swift_temp_url_key': value => $swift_temp_url_key, secret => true;
|
||||||
'glance/swift_temp_url_duration': value => $swift_temp_url_duration;
|
'glance/swift_temp_url_duration': value => $swift_temp_url_duration;
|
||||||
|
'glance/endpoint_override': value => $endpoint_override;
|
||||||
}
|
}
|
||||||
|
|
||||||
if $swift_account_project_name {
|
if $swift_account_project_name {
|
||||||
|
|
|
@ -44,6 +44,10 @@
|
||||||
# The name of project's domain (required for Identity V3).
|
# The name of project's domain (required for Identity V3).
|
||||||
# Defaults to 'Default'
|
# Defaults to 'Default'
|
||||||
#
|
#
|
||||||
|
# [*endpoint_override*]
|
||||||
|
# The endpoint URL for requests for this client
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
class ironic::neutron (
|
class ironic::neutron (
|
||||||
$api_endpoint = $::os_service_default,
|
$api_endpoint = $::os_service_default,
|
||||||
$auth_type = 'password',
|
$auth_type = 'password',
|
||||||
|
@ -53,6 +57,7 @@ class ironic::neutron (
|
||||||
$password = $::os_service_default,
|
$password = $::os_service_default,
|
||||||
$user_domain_name = 'Default',
|
$user_domain_name = 'Default',
|
||||||
$project_domain_name = 'Default',
|
$project_domain_name = 'Default',
|
||||||
|
$endpoint_override = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
ironic_config {
|
ironic_config {
|
||||||
|
@ -64,5 +69,6 @@ class ironic::neutron (
|
||||||
'neutron/project_name': value => $project_name;
|
'neutron/project_name': value => $project_name;
|
||||||
'neutron/user_domain_name': value => $user_domain_name;
|
'neutron/user_domain_name': value => $user_domain_name;
|
||||||
'neutron/project_domain_name': value => $project_domain_name;
|
'neutron/project_domain_name': value => $project_domain_name;
|
||||||
|
'neutron/endpoint_override': value => $endpoint_override;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,6 +40,10 @@
|
||||||
# The name of project's domain (required for Identity V3).
|
# The name of project's domain (required for Identity V3).
|
||||||
# Defaults to 'Default'
|
# Defaults to 'Default'
|
||||||
#
|
#
|
||||||
|
# [*endpoint_override*]
|
||||||
|
# The endpoint URL for requests for this client
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
class ironic::swift (
|
class ironic::swift (
|
||||||
$auth_type = 'password',
|
$auth_type = 'password',
|
||||||
$auth_url = $::os_service_default,
|
$auth_url = $::os_service_default,
|
||||||
|
@ -48,6 +52,7 @@ class ironic::swift (
|
||||||
$password = $::os_service_default,
|
$password = $::os_service_default,
|
||||||
$user_domain_name = 'Default',
|
$user_domain_name = 'Default',
|
||||||
$project_domain_name = 'Default',
|
$project_domain_name = 'Default',
|
||||||
|
$endpoint_override = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
ironic_config {
|
ironic_config {
|
||||||
|
@ -58,5 +63,6 @@ class ironic::swift (
|
||||||
'swift/project_name': value => $project_name;
|
'swift/project_name': value => $project_name;
|
||||||
'swift/user_domain_name': value => $user_domain_name;
|
'swift/user_domain_name': value => $user_domain_name;
|
||||||
'swift/project_domain_name': value => $project_domain_name;
|
'swift/project_domain_name': value => $project_domain_name;
|
||||||
|
'swift/endpoint_override': value => $endpoint_override;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,6 +41,7 @@ describe 'ironic::cinder' do
|
||||||
is_expected.to contain_ironic_config('cinder/password').with_value('<SERVICE DEFAULT>').with_secret(true)
|
is_expected.to contain_ironic_config('cinder/password').with_value('<SERVICE DEFAULT>').with_secret(true)
|
||||||
is_expected.to contain_ironic_config('cinder/user_domain_name').with_value('Default')
|
is_expected.to contain_ironic_config('cinder/user_domain_name').with_value('Default')
|
||||||
is_expected.to contain_ironic_config('cinder/project_domain_name').with_value('Default')
|
is_expected.to contain_ironic_config('cinder/project_domain_name').with_value('Default')
|
||||||
|
is_expected.to contain_ironic_config('cinder/endpoint_override').with_value('<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when overriding parameters' do
|
context 'when overriding parameters' do
|
||||||
|
@ -53,6 +54,7 @@ describe 'ironic::cinder' do
|
||||||
:password => 'pa$$w0rd',
|
:password => 'pa$$w0rd',
|
||||||
:user_domain_name => 'NonDefault',
|
:user_domain_name => 'NonDefault',
|
||||||
:project_domain_name => 'NonDefault',
|
:project_domain_name => 'NonDefault',
|
||||||
|
:endpoint_override => 'http://example2.com',
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -64,6 +66,7 @@ describe 'ironic::cinder' do
|
||||||
is_expected.to contain_ironic_config('cinder/password').with_value(p[:password]).with_secret(true)
|
is_expected.to contain_ironic_config('cinder/password').with_value(p[:password]).with_secret(true)
|
||||||
is_expected.to contain_ironic_config('cinder/user_domain_name').with_value(p[:user_domain_name])
|
is_expected.to contain_ironic_config('cinder/user_domain_name').with_value(p[:user_domain_name])
|
||||||
is_expected.to contain_ironic_config('cinder/project_domain_name').with_value(p[:project_domain_name])
|
is_expected.to contain_ironic_config('cinder/project_domain_name').with_value(p[:project_domain_name])
|
||||||
|
is_expected.to contain_ironic_config('cinder/endpoint_override').with_value(p[:endpoint_override])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -49,6 +49,7 @@ describe 'ironic::glance' do
|
||||||
is_expected.to contain_ironic_config('glance/swift_endpoint_url').with(:value => '<SERVICE DEFAULT>')
|
is_expected.to contain_ironic_config('glance/swift_endpoint_url').with(:value => '<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_ironic_config('glance/swift_temp_url_key').with(:value => '<SERVICE DEFAULT>').with_secret(true)
|
is_expected.to contain_ironic_config('glance/swift_temp_url_key').with(:value => '<SERVICE DEFAULT>').with_secret(true)
|
||||||
is_expected.to contain_ironic_config('glance/swift_temp_url_duration').with(:value => '<SERVICE DEFAULT>')
|
is_expected.to contain_ironic_config('glance/swift_temp_url_duration').with(:value => '<SERVICE DEFAULT>')
|
||||||
|
is_expected.to contain_ironic_config('glance/endpoint_override').with_value('<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when overriding parameters' do
|
context 'when overriding parameters' do
|
||||||
|
@ -69,6 +70,7 @@ describe 'ironic::glance' do
|
||||||
:swift_endpoint_url => 'http://example2.com',
|
:swift_endpoint_url => 'http://example2.com',
|
||||||
:swift_temp_url_key => 'the-key',
|
:swift_temp_url_key => 'the-key',
|
||||||
:swift_temp_url_duration => 3600,
|
:swift_temp_url_duration => 3600,
|
||||||
|
:endpoint_override => 'http://example2.com',
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -88,6 +90,7 @@ describe 'ironic::glance' do
|
||||||
is_expected.to contain_ironic_config('glance/swift_endpoint_url').with_value(p[:swift_endpoint_url])
|
is_expected.to contain_ironic_config('glance/swift_endpoint_url').with_value(p[:swift_endpoint_url])
|
||||||
is_expected.to contain_ironic_config('glance/swift_temp_url_key').with_value(p[:swift_temp_url_key]).with_secret(true)
|
is_expected.to contain_ironic_config('glance/swift_temp_url_key').with_value(p[:swift_temp_url_key]).with_secret(true)
|
||||||
is_expected.to contain_ironic_config('glance/swift_temp_url_duration').with_value(p[:swift_temp_url_duration])
|
is_expected.to contain_ironic_config('glance/swift_temp_url_duration').with_value(p[:swift_temp_url_duration])
|
||||||
|
is_expected.to contain_ironic_config('glance/endpoint_override').with_value(p[:endpoint_override])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -103,7 +106,8 @@ describe 'ironic::glance' do
|
||||||
:project_domain_name => 'NonDefault',
|
:project_domain_name => 'NonDefault',
|
||||||
:api_servers => ['10.0.0.1:9292','10.0.0.2:9292'],
|
:api_servers => ['10.0.0.1:9292','10.0.0.2:9292'],
|
||||||
:api_insecure => true,
|
:api_insecure => true,
|
||||||
:num_retries => 42
|
:num_retries => 42,
|
||||||
|
:endpoint_override => 'http://example2.com',
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -118,6 +122,7 @@ describe 'ironic::glance' do
|
||||||
is_expected.to contain_ironic_config('glance/glance_api_servers').with_value(p[:api_servers].join(','))
|
is_expected.to contain_ironic_config('glance/glance_api_servers').with_value(p[:api_servers].join(','))
|
||||||
is_expected.to contain_ironic_config('glance/glance_api_insecure').with_value(p[:api_insecure])
|
is_expected.to contain_ironic_config('glance/glance_api_insecure').with_value(p[:api_insecure])
|
||||||
is_expected.to contain_ironic_config('glance/glance_num_retries').with_value(p[:num_retries])
|
is_expected.to contain_ironic_config('glance/glance_num_retries').with_value(p[:num_retries])
|
||||||
|
is_expected.to contain_ironic_config('glance/endpoint_override').with_value(p[:endpoint_override])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -42,6 +42,7 @@ describe 'ironic::neutron' do
|
||||||
is_expected.to contain_ironic_config('neutron/password').with_value('<SERVICE DEFAULT>').with_secret(true)
|
is_expected.to contain_ironic_config('neutron/password').with_value('<SERVICE DEFAULT>').with_secret(true)
|
||||||
is_expected.to contain_ironic_config('neutron/user_domain_name').with_value('Default')
|
is_expected.to contain_ironic_config('neutron/user_domain_name').with_value('Default')
|
||||||
is_expected.to contain_ironic_config('neutron/project_domain_name').with_value('Default')
|
is_expected.to contain_ironic_config('neutron/project_domain_name').with_value('Default')
|
||||||
|
is_expected.to contain_ironic_config('neutron/endpoint_override').with_value('<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when overriding parameters' do
|
context 'when overriding parameters' do
|
||||||
|
@ -55,6 +56,7 @@ describe 'ironic::neutron' do
|
||||||
:password => 'pa$$w0rd',
|
:password => 'pa$$w0rd',
|
||||||
:user_domain_name => 'NonDefault',
|
:user_domain_name => 'NonDefault',
|
||||||
:project_domain_name => 'NonDefault',
|
:project_domain_name => 'NonDefault',
|
||||||
|
:endpoint_override => 'http://example2.com',
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -67,6 +69,7 @@ describe 'ironic::neutron' do
|
||||||
is_expected.to contain_ironic_config('neutron/password').with_value(p[:password]).with_secret(true)
|
is_expected.to contain_ironic_config('neutron/password').with_value(p[:password]).with_secret(true)
|
||||||
is_expected.to contain_ironic_config('neutron/user_domain_name').with_value(p[:user_domain_name])
|
is_expected.to contain_ironic_config('neutron/user_domain_name').with_value(p[:user_domain_name])
|
||||||
is_expected.to contain_ironic_config('neutron/project_domain_name').with_value(p[:project_domain_name])
|
is_expected.to contain_ironic_config('neutron/project_domain_name').with_value(p[:project_domain_name])
|
||||||
|
is_expected.to contain_ironic_config('neutron/endpoint_override').with_value(p[:endpoint_override])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -41,6 +41,7 @@ describe 'ironic::swift' do
|
||||||
is_expected.to contain_ironic_config('swift/password').with_value('<SERVICE DEFAULT>').with_secret(true)
|
is_expected.to contain_ironic_config('swift/password').with_value('<SERVICE DEFAULT>').with_secret(true)
|
||||||
is_expected.to contain_ironic_config('swift/user_domain_name').with_value('Default')
|
is_expected.to contain_ironic_config('swift/user_domain_name').with_value('Default')
|
||||||
is_expected.to contain_ironic_config('swift/project_domain_name').with_value('Default')
|
is_expected.to contain_ironic_config('swift/project_domain_name').with_value('Default')
|
||||||
|
is_expected.to contain_ironic_config('swift/endpoint_override').with_value('<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when overriding parameters' do
|
context 'when overriding parameters' do
|
||||||
|
@ -53,6 +54,7 @@ describe 'ironic::swift' do
|
||||||
:password => 'pa$$w0rd',
|
:password => 'pa$$w0rd',
|
||||||
:user_domain_name => 'NonDefault',
|
:user_domain_name => 'NonDefault',
|
||||||
:project_domain_name => 'NonDefault',
|
:project_domain_name => 'NonDefault',
|
||||||
|
:endpoint_override => 'http://example2.com',
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -64,6 +66,7 @@ describe 'ironic::swift' do
|
||||||
is_expected.to contain_ironic_config('swift/password').with_value(p[:password]).with_secret(true)
|
is_expected.to contain_ironic_config('swift/password').with_value(p[:password]).with_secret(true)
|
||||||
is_expected.to contain_ironic_config('swift/user_domain_name').with_value(p[:user_domain_name])
|
is_expected.to contain_ironic_config('swift/user_domain_name').with_value(p[:user_domain_name])
|
||||||
is_expected.to contain_ironic_config('swift/project_domain_name').with_value(p[:project_domain_name])
|
is_expected.to contain_ironic_config('swift/project_domain_name').with_value(p[:project_domain_name])
|
||||||
|
is_expected.to contain_ironic_config('swift/endpoint_override').with_value(p[:endpoint_override])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue