openstack
/
charm-trove
Code Issues Proposed changes

Changed the way rabbit is configured in each of the config files.

This commit is contained in:
Jonathan Arrance 2016-09-11 23:30:54 -04:00
parent 4327d6591c
commit 6160aa5798
4 changed files with 70 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/templates/mitaka/trove-conductor.conf
View File

@ -33,4 +33,25 @@ control_exchange = trove
connection = {{ shared_db.uri }}
[oslo_messaging_rabbit]
{% include "parts/section-rabbitmq-oslo" %}
#{% include "parts/section-rabbitmq-oslo" %}
{% if rabbitmq_host or rabbitmq_hosts -%}
rabbit_userid = {{ rabbitmq_user }}
rabbit_virtual_host = {{ rabbitmq_virtual_host }}
rabbit_password = {{ rabbitmq_password }}
{% if rabbitmq_hosts -%}
rabbit_hosts = {{ rabbitmq_hosts }}
{% if rabbitmq_ha_queues -%}
rabbit_ha_queues = True
rabbit_durable_queues = False
{% endif -%}
{% else -%}
rabbit_host = {{ rabbitmq_host }}
{% endif -%}
{% if rabbit_ssl_port -%}
rabbit_use_ssl = True
rabbit_port = {{ rabbit_ssl_port }}
{% if rabbit_ssl_ca -%}
kombu_ssl_ca_certs = {{ rabbit_ssl_ca }}
{% endif -%}
{% endif -%}
{% endif -%}

23
src/templates/mitaka/trove-guestagent.conf
View File

@ -83,7 +83,28 @@ log_config_append = /etc/trove/trove-logging-guestagent.conf
#trace_sqlalchemy = True
[oslo_messaging_rabbit]
{% include "parts/section-rabbitmq-oslo" %}
#{% include "parts/section-rabbitmq-oslo" %}
{% if rabbitmq_host or rabbitmq_hosts -%}
rabbit_userid = {{ rabbitmq_user }}
rabbit_virtual_host = {{ rabbitmq_virtual_host }}
rabbit_password = {{ rabbitmq_password }}
{% if rabbitmq_hosts -%}
rabbit_hosts = {{ rabbitmq_hosts }}
{% if rabbitmq_ha_queues -%}
rabbit_ha_queues = True
rabbit_durable_queues = False
{% endif -%}
{% else -%}
rabbit_host = {{ rabbitmq_host }}
{% endif -%}
{% if rabbit_ssl_port -%}
rabbit_use_ssl = True
rabbit_port = {{ rabbit_ssl_port }}
{% if rabbit_ssl_ca -%}
kombu_ssl_ca_certs = {{ rabbit_ssl_ca }}
{% endif -%}
{% endif -%}
{% endif -%}
# ========== Datastore Specific Configuration Options ==========

31
src/templates/mitaka/trove-taskmanager.conf
View File

@ -13,9 +13,9 @@ update_status_on_fail = True
log_dir = /var/log/trove
trove_auth_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:5000/v{{ options.keystone-api-version }}.0
nova_compute_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8774/v2
cinder_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8776/v1
swift_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8080/v1/AUTH_
#nova_compute_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8774/v2
#cinder_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8776/v1
#swift_url = {{ identity_service.service_protocol }}://{{ identity_service.auth_host }}:8080/v1/AUTH_
notifier_queue_hostname = controller
backend = rabbit
@ -97,8 +97,29 @@ device_path = /dev/vdb
#taskmanager_strategy = trove.common.strategies.cluster.experimental.vertica.taskmanager.VerticaTaskManagerStrategy
{% include "parts/section-rabbitmq-oslo" %}
#{% include "parts/section-rabbitmq-oslo" %}
[oslo_messaging_rabbit]
{% if rabbitmq_host or rabbitmq_hosts -%}
rabbit_userid = {{ rabbitmq_user }}
rabbit_virtual_host = {{ rabbitmq_virtual_host }}
rabbit_password = {{ rabbitmq_password }}
{% if rabbitmq_hosts -%}
rabbit_hosts = {{ rabbitmq_hosts }}
{% if rabbitmq_ha_queues -%}
rabbit_ha_queues = True
rabbit_durable_queues = False
{% endif -%}
{% else -%}
rabbit_host = {{ rabbitmq_host }}
{% endif -%}
{% if rabbit_ssl_port -%}
rabbit_use_ssl = True
rabbit_port = {{ rabbit_ssl_port }}
{% if rabbit_ssl_ca -%}
kombu_ssl_ca_certs = {{ rabbit_ssl_ca }}
{% endif -%}
{% endif -%}
{% endif -%}
[database]
#{% include "parts/database" %}

2
src/templates/mitaka/trove.conf
View File

@ -56,8 +56,6 @@ neutron_service_type = network
#max_backups_per_tenant = 5
#volume_time_out=30
[oslo_messaging_rabbit]
{% if rabbitmq_host or rabbitmq_hosts -%}
rabbit_userid = {{ rabbitmq_user }}