Add transport_url parameter for oslo.messaging

This commit adds the transport_url parameter for oslo.messaging. The
url is of the form:

  transport://user:pass@host1:port[,hostN:portN]/virtual_host

Where the transport scheme specifies the rpc or notification backend
as one of rabbit, amqp, zmq, etc. Oslo.messaging is deprecating the
host, port, and auth configuration options [1]. All drivers will get
these options via the transport_url.

This patch:
* use oslo::messaging::default resource
* add parameter for transport_url
* update spec test
* add feature release note

[1] https://review.openstack.org/#/c/317285/

Change-Id: I29525aabbea99e36546643f4e80d4970fc2a04ac
This commit is contained in:
Andrew Smith 2016-05-27 12:25:02 -04:00
parent 8c1002c65c
commit f09ef1dc2e
3 changed files with 12 additions and 0 deletions

View File

@ -56,6 +56,12 @@
# (optional) What RPC queue/exchange to use (string value)
# Defaults to $::os_service_default
#
# [*default_transport_url*]
# (optional) A URL representing the messaging driver to use and its full
# configuration. Transport URLs take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $::os_service_default
#
# [*rpc_backend*]
# (optional) what rpc/queuing service to use (string value)
# Defaults to $::os_service_default
@ -296,6 +302,7 @@ class ironic (
$enabled_drivers = ['pxe_ipmitool'],
$control_exchange = $::os_service_default,
$rpc_response_timeout = $::os_service_default,
$default_transport_url = $::os_service_default,
$rpc_backend = $::os_service_default,
$rabbit_host = $::os_service_default,
$rabbit_hosts = $::os_service_default,
@ -415,6 +422,7 @@ class ironic (
}
oslo::messaging::default {'ironic_config':
transport_url => $default_transport_url,
rpc_response_timeout => $rpc_response_timeout,
control_exchange => $control_exchange,
}

View File

@ -0,0 +1,3 @@
---
features:
- Add oslo.messaging transport_url parameter via puppet-oslo resource

View File

@ -126,6 +126,7 @@ describe 'ironic' do
is_expected.to contain_ironic_config('DEFAULT/my_ip').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('DEFAULT/rpc_response_timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('DEFAULT/control_exchange').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('DEFAULT/transport_url').with_value('<SERVICE DEFAULT>')
end
end