diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-10-19 13:55:42 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-10-19 13:55:42 +0000 |
commit | e86706f0f6c589ed8baeb9616b128a738b330a94 (patch) | |
tree | 65cb3b11b74addac0c4cca94d9988c672cfc0477 /manifests/profile/base/glance | |
parent | b078fcd39c414d1f897ae559ea11a0ce4b6b9c25 (diff) | |
parent | 597194a4199b34e1389b26f080ae1fefccbca924 (diff) |
Merge "Add port to rabbitmq node ip list"
Diffstat (limited to 'manifests/profile/base/glance')
-rw-r--r-- | manifests/profile/base/glance/api.pp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp index ecffd7f..f3db396 100644 --- a/manifests/profile/base/glance/api.pp +++ b/manifests/profile/base/glance/api.pp @@ -30,11 +30,16 @@ # [*rabbit_hosts*] # list of the rabbbit host IPs # Defaults to hiera('rabbitmq_node_ips') +# +# [*rabbit_port*] +# IP port for rabbitmq service +# Defaults to hiera('glance::notify::rabbitmq::rabbit_port', 5672) class tripleo::profile::base::glance::api ( $glance_backend = downcase(hiera('glance_backend', 'swift')), $step = hiera('step'), $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_port = hiera('glance::notify::rabbitmq::rabbit_port', 5672), ) { if $step >= 4 { @@ -53,8 +58,9 @@ class tripleo::profile::base::glance::api ( class { '::glance::api': stores => $glance_store, } + class { '::glance::notify::rabbitmq' : - rabbit_hosts => $rabbit_hosts, + rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}") } include join(['::glance::backend::', $glance_backend]) } |