diff options
| author |   Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2016-11-28 08:34:20 +0200 |
|---|---|---|
| committer | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2016-11-28 15:45:03 +0200 |
| commit | 91597fc56983ee20d77985e97ad7563fcd30f1bc (patch) | |
| tree | 7c4175c0402ca0e10c3160912ee8b259d90a590d /manifests/profile/base/swift | |
| parent | 3246b2b3837bb3abc9602cbbcd38952205d67a30 (diff) | |
Use FQDNs for the services' RabbitMQ configuration
This replaces the services' IP-based RabbitMQ configuration and uses
FQDNs instead.
Change-Id: I2be81aecacf50839a029533247981f5edf59cb7f
Diffstat (limited to 'manifests/profile/base/swift')
| -rw-r--r-- | manifests/profile/base/swift/proxy.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp index ea309db..974a725 100644 --- a/manifests/profile/base/swift/proxy.pp +++ b/manifests/profile/base/swift/proxy.pp @@ -32,8 +32,8 @@ # Defaults to 11211 # # [*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 @@ -43,7 +43,7 @@ class tripleo::profile::base::swift::proxy ( $step = hiera('step'), $memcache_servers = hiera('memcached_node_ips'), $memcache_port = 11211, - $rabbit_hosts = hiera('rabbitmq_node_ips', undef), + $rabbit_hosts = hiera('rabbitmq_node_names', undef), $rabbit_port = hiera('swift::proxy::ceilometer::rabbit_port', 5672), ) { if $step >= 4 { @@ -63,7 +63,7 @@ class tripleo::profile::base::swift::proxy ( include ::swift::proxy::tempurl include ::swift::proxy::formpost include ::swift::proxy::bulk - $swift_rabbit_hosts = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}") + $swift_rabbit_hosts = suffix(any2array($rabbit_hosts), ":${rabbit_port}") class { '::swift::proxy::ceilometer': rabbit_hosts => $swift_rabbit_hosts, } |