diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-20 16:04:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-20 16:04:16 +0000 |
| commit | cacf9e6e928940a2718b03e833d585eab6050c30 (patch) | |
| tree | 7c2ecf4d4135d718d2ebf40147e746634dba56cc /manifests/profile/base/swift | |
| parent | 543afad72e79013a020f64306c4f7795d99dd7c6 (diff) | |
| parent | e1a1a5cbedad165b4942d77f48c2c55605c70adb (diff) | |
Merge "Use rpc and notify transport_url for oslo_messaging backends"
Diffstat (limited to 'manifests/profile/base/swift')
| -rw-r--r-- | manifests/profile/base/swift/proxy.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp index 5f3408d..0d9ba68 100644 --- a/manifests/profile/base/swift/proxy.pp +++ b/manifests/profile/base/swift/proxy.pp @@ -24,7 +24,7 @@ # # [*ceilometer_messaging_driver*] # Driver for messaging service. -# Defaults to hiera('messaging_service_name', 'rabbit') +# Defaults to hiera('messaging_notify_service_name', 'rabbit') # # [*ceilometer_messaging_hosts*] # list of the messaging host fqdns @@ -61,7 +61,7 @@ # class tripleo::profile::base::swift::proxy ( $ceilometer_enabled = true, - $ceilometer_messaging_driver = hiera('messaging_service_name', 'rabbit'), + $ceilometer_messaging_driver = hiera('messaging_notify_service_name', 'rabbit'), $ceilometer_messaging_hosts = any2array(hiera('rabbitmq_node_names', undef)), $ceilometer_messaging_password = hiera('swift::proxy::ceilometer::rabbit_password', undef), $ceilometer_messaging_port = hiera('tripleo::profile::base::swift::proxy::rabbit_port', '5672'), |