diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-09-03 16:05:22 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-09-03 16:05:22 +0000 |
commit | 4936c4da5d0bd81e31bc95382db499d30efe5b64 (patch) | |
tree | d6a9220fb2f9585adb61f308768c5f70509a256b /manifests/profile/base/nova.pp | |
parent | 97d1c35cf97630637f82555e321aad7077b5364f (diff) | |
parent | e5f0042e47eb4c2b77348dcec0d3d2730e5d9841 (diff) |
Merge "Make service profiles default to rabbitmq_node_ips"
Diffstat (limited to 'manifests/profile/base/nova.pp')
-rw-r--r-- | manifests/profile/base/nova.pp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp index b43b8e8..74f0460 100644 --- a/manifests/profile/base/nova.pp +++ b/manifests/profile/base/nova.pp @@ -38,12 +38,17 @@ # (Optional) The current step of the deployment # Defaults to hiera('step') # +# [*rabbit_hosts*] +# list of the rabbbit host IPs +# Defaults to hiera('rabbitmq_node_ips') + class tripleo::profile::base::nova ( $bootstrap_node = hiera('bootstrap_nodeid', undef), $libvirt_enabled = false, $manage_migration = false, $nova_compute_enabled = false, $step = hiera('step'), + $rabbit_hosts = hiera('rabbitmq_node_ips', undef), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true @@ -58,7 +63,9 @@ class tripleo::profile::base::nova ( } if hiera('step') >= 4 or (hiera('step') >= 3 and $sync_db) { - include ::nova + class { '::nova' : + rabbit_hosts => $rabbit_hosts, + } include ::nova::config class { '::nova::cache': enabled => true, |