openstack
/
salt-formula-ceilometer
Code Issues Proposed changes

[RabbitMQ] Parameterized message queue hosts to enable client-side HA. 

Change-Id: I8fead4ffcc59e02660a45a4226375141bf73a6f0
This commit is contained in:
smolaon 2016-05-31 10:30:15 +02:00
parent c6103bd1e4
commit d0d14d2f99
5 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
README.rst
View File

@ -38,7 +38,6 @@ Ceilometer API/controller node
user: openstack
password: pwd
virtual_host: '/openstack'
rabbit_ha_queues: true
database:
engine: mongodb
host: 127.0.0.1
@ -47,6 +46,25 @@ Ceilometer API/controller node
user: ceilometer
password: pwd
Client-side RabbitMQ HA setup
.. code-block:: yaml
ceilometer:
server:
....
message_queue:
engine: rabbitmq
members:
- host: 127.0.0.1
- host: 127.0.0.1
- host: 127.0.0.1
user: openstack
password: pwd
virtual_host: '/openstack'
....
Ceilometer Graphite publisher
.. code-block:: yaml

13
ceilometer/files/kilo/ceilometer-server.conf.Debian
View File

@ -511,6 +511,15 @@ graphite=ceilometer.publisher.graphite:GraphitePublisher
#kombu_reconnect_delay = 1.0
kombu_reconnect_delay = 5.0
# RabbitMQ HA cluster host:port pairs. (list value)
# Deprecated group/name - [DEFAULT]/rabbit_hosts
{%- if server.message_queue.members is defined %}
rabbit_hosts = {% for member in server.message_queue.members -%}
{{ member.host }}:{{ member.get('port', 5672) }}
{%- if not loop.last -%},{%- endif -%}
{%- endfor -%}
{%- else %}
# The RabbitMQ broker address where a single node is used. (string
# value)
# Deprecated group/name - [DEFAULT]/rabbit_host
@ -523,9 +532,7 @@ rabbit_host = {{ server.message_queue.host }}
#rabbit_port = 5672
rabbit_port = {{ server.message_queue.port }}
# RabbitMQ HA cluster host:port pairs. (list value)
# Deprecated group/name - [DEFAULT]/rabbit_hosts
#rabbit_hosts = $rabbit_host:$rabbit_port
{%- endif %}
# Connect over SSL for RabbitMQ. (boolean value)
# Deprecated group/name - [DEFAULT]/rabbit_use_ssl

13
ceilometer/files/liberty/ceilometer-server.conf.Debian
View File

@ -512,6 +512,15 @@ graphite=ceilometer.publisher.graphite:GraphitePublisher
#kombu_reconnect_delay = 1.0
kombu_reconnect_delay = 5.0
# RabbitMQ HA cluster host:port pairs. (list value)
# Deprecated group/name - [DEFAULT]/rabbit_hosts
{%- if server.message_queue.members is defined %}
rabbit_hosts = {% for member in server.message_queue.members -%}
{{ member.host }}:{{ member.get('port', 5672) }}
{%- if not loop.last -%},{%- endif -%}
{%- endfor -%}
{%- else %}
# The RabbitMQ broker address where a single node is used. (string
# value)
# Deprecated group/name - [DEFAULT]/rabbit_host
@ -524,9 +533,7 @@ rabbit_host = {{ server.message_queue.host }}
#rabbit_port = 5672
rabbit_port = {{ server.message_queue.port }}
# RabbitMQ HA cluster host:port pairs. (list value)
# Deprecated group/name - [DEFAULT]/rabbit_hosts
#rabbit_hosts = $rabbit_host:$rabbit_port
{%- endif %}
# Connect over SSL for RabbitMQ. (boolean value)
# Deprecated group/name - [DEFAULT]/rabbit_use_ssl

1
metadata/service/server/cluster.yml
View File

@ -29,7 +29,6 @@ parameters:
user: openstack
password: ${_param:rabbitmq_openstack_password}
virtual_host: '/openstack'
ha_queues: true
# Workaround for https://bugs.launchpad.net/ceilometer/+bug/1337715
rpc_thread_pool_size: 5
database:

7
tests/pillar/server_cluster.sls
View File

@ -19,12 +19,13 @@ ceilometer:
password: password
message_queue:
engine: rabbitmq
host: 127.0.0.1
port: 5672
members:
- host: 127.0.0.1
- host: 127.0.0.1
- host: 127.0.0.1
user: openstack
password: password
virtual_host: '/openstack'
ha_queues: true
# Workaround for https://bugs.launchpad.net/ceilometer/+bug/1337715
rpc_thread_pool_size: 5
database: