diff options
| author |   Brent Eagles <beagles@redhat.com> | 2016-10-14 16:35:44 -0230 |
|---|---|---|
| committer | Brent Eagles <beagles@redhat.com> | 2016-10-17 14:31:15 -0230 |
| commit | 597194a4199b34e1389b26f080ae1fefccbca924 (patch) | |
| tree | 945c8639780c1ad252a565810ea1df6c757ac770 /manifests/profile/base/nova.pp | |
| parent | b54e9c3a05f9bf5870e7bb98b2a8322640a6c847 (diff) | |
Add port to rabbitmq node ip list
We use the rabbit_hosts configuration for most of our services but we
haven't been adding the configured port. This patch appends the IP port
used provided to the service's heat template to the IPs in the list.
Note: while we could use the value set for the rabbitmq server in
rabbitmq::port, it doesn't allow for dealing with SSL. This also is also
backwards compatible with the RabbitClientPort parameters used in the
heat templates.
Change-Id: I0000f039144a6b0e98c0a148dc69324f60db3d8b
Closes-Bug: #1633580
Diffstat (limited to 'manifests/profile/base/nova.pp')
| -rw-r--r-- | manifests/profile/base/nova.pp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp index 74f0460..b397802 100644 --- a/manifests/profile/base/nova.pp +++ b/manifests/profile/base/nova.pp @@ -41,6 +41,10 @@ # [*rabbit_hosts*] # list of the rabbbit host IPs # Defaults to hiera('rabbitmq_node_ips') +# +# [*rabbit_port*] +# IP port for rabbitmq service +# Defaults to hiera('nova::rabbit_port', 5672) class tripleo::profile::base::nova ( $bootstrap_node = hiera('bootstrap_nodeid', undef), @@ -49,6 +53,7 @@ class tripleo::profile::base::nova ( $nova_compute_enabled = false, $step = hiera('step'), $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_port = hiera('nova::rabbit_port', 5672), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true @@ -64,7 +69,7 @@ class tripleo::profile::base::nova ( if hiera('step') >= 4 or (hiera('step') >= 3 and $sync_db) { class { '::nova' : - rabbit_hosts => $rabbit_hosts, + rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}") } include ::nova::config class { '::nova::cache': |