diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-30 17:05:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-30 17:05:51 +0000 |
| commit | 94857b61cf43b519357d1f3da89b2a083c11d3d8 (patch) | |
| tree | 6bf906c41a8ad8553b6d0f1cc7c5916fb968ce94 /manifests/profile/base/keystone.pp | |
| parent | f101ee540a450d3509e1c97aab00a97a2ecf8164 (diff) | |
| parent | 91597fc56983ee20d77985e97ad7563fcd30f1bc (diff) | |
Merge "Use FQDNs for the services' RabbitMQ configuration"
Diffstat (limited to 'manifests/profile/base/keystone.pp')
| -rw-r--r-- | manifests/profile/base/keystone.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp index ff8d790..26e7b1f 100644 --- a/manifests/profile/base/keystone.pp +++ b/manifests/profile/base/keystone.pp @@ -78,8 +78,8 @@ # # # [*rabbit_hosts*] -# list of the rabbbit host IPs -# Defaults to hiera('rabbitmq_node_ips') +# list of the rabbbit host fqdns +# Defaults to hiera('rabbitmq_node_names') # # [*rabbit_port*] # IP port for rabbitmq service @@ -102,7 +102,7 @@ class tripleo::profile::base::keystone ( $heat_admin_user = undef, $manage_db_purge = hiera('keystone_enable_db_purge', true), $public_endpoint_network = hiera('keystone_public_api_network', undef), - $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_hosts = hiera('rabbitmq_node_names', undef), $rabbit_port = hiera('keystone::rabbit_port', 5672), $step = hiera('step'), ) { @@ -142,7 +142,7 @@ class tripleo::profile::base::keystone ( } if $step >= 4 or ( $step >= 3 and $sync_db ) { - $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}") + $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}") class { '::keystone': sync_db => $sync_db, enable_bootstrap => $sync_db, |