Add os_actions_endpoint_type parameter

This is used by mistral to determine the endpoint that it'll use to
perform actions for services. It is useful if you want to use
something other than the public endpoints to perform action, for
instance, using the internal endpoints instead.

Depends-On: I5a27488c83c998ffb604a673fc1024bcbaed52d2
Change-Id: I809c88d92e24231c2b5e23230e1b006b538382ac
This commit is contained in:
Juan Antonio Osorio Robles
2016-09-13 13:55:27 +03:00
parent 79ed6fb58e
commit 35f3fe083a
2 changed files with 20 additions and 0 deletions

View File

@@ -19,6 +19,11 @@
# (optional) Specifies the admin Identity URI for Mistral to use.
# Default 'http://localhost:35357/'.
#
# [*os_actions_endpoint_type*]
# (optional) Type of endpoint in identity service catalog to use for
# communication with OpenStack services
# Defaults to $::os_service_default
#
# [*keystone_user*]
# (optional) The name of the auth user
# Defaults to 'mistral'.
@@ -203,6 +208,7 @@ class mistral(
$rpc_backend = $::os_service_default,
$auth_uri = 'http://localhost:5000/',
$identity_uri = 'http://localhost:35357/',
$os_actions_endpoint_type = $::os_service_default,
$control_exchange = $::os_service_default,
$rpc_response_timeout = $::os_service_default,
$rabbit_host = $::os_service_default,
@@ -265,6 +271,7 @@ class mistral(
'coordination/heartbeat_interval': value => $coordination_heartbeat_interval;
'DEFAULT/report_interval': value => $report_interval;
'DEFAULT/service_down_time': value => $service_down_time;
'DEFAULT/os_actions_endpoint_type': value => $os_actions_endpoint_type;
}
oslo::messaging::default {'mistral_config':

View File

@@ -64,6 +64,9 @@ describe 'mistral' do
is_expected.to contain_mistral_config('keystone_authtoken/admin_password').with(
:value => 'foo'
)
is_expected.to contain_mistral_config('DEFAULT/os_actions_endpoint_type').with(
:value => '<SERVICE DEFAULT>'
)
end
end
@@ -211,4 +214,14 @@ describe 'mistral' do
end
end
describe 'with os_actions_keystone_endpoint overriden' do
let :params do
req_params.merge({
:os_actions_endpoint_type => 'internal',
})
end
it { is_expected.to contain_mistral_config('DEFAULT/os_actions_endpoint_type').with_value('internal') }
end
end