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/nova.pp | |
| parent | b078fcd39c414d1f897ae559ea11a0ce4b6b9c25 (diff) | |
| parent | 597194a4199b34e1389b26f080ae1fefccbca924 (diff) | |
Merge "Add port to rabbitmq node ip list"
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': |