openstack/openstack-ansible-os_trove
Code Issues Proposed changes

Merge "Update messaging notification configuration"

Browse Source
This commit is contained in:
Zuul 2018-11-10 10:19:56 +00:00 committed by Gerrit Code Review
commit 1eb07d4672
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -74,6 +74,9 @@ trove_api_workers: "{{ [[ansible_processor_vcpus|default(2) // 2, 1] | max, trov
trove_conductor_workers_max: 16 trove_conductor_workers_max: 16
trove_conductor_workers: "{{ [[ansible_processor_vcpus|default(2) // 2, 1] | max, trove_conductor_workers_max] | min }}" trove_conductor_workers: "{{ [[ansible_processor_vcpus|default(2) // 2, 1] | max, trove_conductor_workers_max] | min }}"
# Enable/Disable Ceilometer
trove_ceilometer_enabled: False
# TODO(odyssey4me): # TODO(odyssey4me):
# This can be simplified once all the roles are using # This can be simplified once all the roles are using
# python_venv_build. We can then switch to using a # python_venv_build. We can then switch to using a

1
templates/trove-conductor.conf.j2
View File

@ -24,4 +24,5 @@ connection = "{{ trove_galera_connection_string }}"
ssl={{ trove_oslomsg_rpc_use_ssl }} ssl={{ trove_oslomsg_rpc_use_ssl }}
[oslo_messaging_notifications] [oslo_messaging_notifications]
driver = {% if trove_ceilometer_enabled %}messagingv2{% else %}noop{% endif %}
transport_url = {{ trove_oslomsg_notify_transport }}://{% for host in trove_oslomsg_notify_servers.split(',') %}{{ trove_oslomsg_notify_userid }}:{{ trove_oslomsg_notify_password }}@{{ host }}:{{ trove_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ trove_oslomsg_notify_vhost }}{% endif %}{% endfor %} transport_url = {{ trove_oslomsg_notify_transport }}://{% for host in trove_oslomsg_notify_servers.split(',') %}{{ trove_oslomsg_notify_userid }}:{{ trove_oslomsg_notify_password }}@{{ host }}:{{ trove_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ trove_oslomsg_notify_vhost }}{% endif %}{% endfor %}

1
templates/trove-guestagent.conf.j2
View File

@ -59,6 +59,7 @@ log_file = trove-guestagent.log
ssl = {{ trove_guest_oslomsg_rpc_use_ssl }} ssl = {{ trove_guest_oslomsg_rpc_use_ssl }}
[oslo_messaging_notifications] [oslo_messaging_notifications]
driver = {% if trove_ceilometer_enabled %}messagingv2{% else %}noop{% endif %}
transport_url = {{ trove_oslomsg_notify_transport }}://{% for host in trove_oslomsg_notify_servers.split(',') %}{{ trove_oslomsg_notify_userid }}:{{ trove_oslomsg_notify_password }}@{{ host }}:{{ trove_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ trove_oslomsg_notify_vhost }}{% endif %}{% endfor %} transport_url = {{ trove_oslomsg_notify_transport }}://{% for host in trove_oslomsg_notify_servers.split(',') %}{{ trove_oslomsg_notify_userid }}:{{ trove_oslomsg_notify_password }}@{{ host }}:{{ trove_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ trove_oslomsg_notify_vhost }}{% endif %}{% endfor %}
# ========== Datastore Specific Configuration Options ========== # ========== Datastore Specific Configuration Options ==========

1
templates/trove.conf.j2
View File

@ -119,6 +119,7 @@ enabled = {{ trove_profiler_enabled }}
ssl = {{ trove_oslomsg_rpc_use_ssl }} ssl = {{ trove_oslomsg_rpc_use_ssl }}
[oslo_messaging_notifications] [oslo_messaging_notifications]
driver = {% if trove_ceilometer_enabled %}messagingv2{% else %}noop{% endif %}
transport_url = {{ trove_oslomsg_notify_transport }}://{% for host in trove_oslomsg_notify_servers.split(',') %}{{ trove_oslomsg_notify_userid }}:{{ trove_oslomsg_notify_password }}@{{ host }}:{{ trove_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ trove_oslomsg_notify_vhost }}{% endif %}{% endfor %} transport_url = {{ trove_oslomsg_notify_transport }}://{% for host in trove_oslomsg_notify_servers.split(',') %}{{ trove_oslomsg_notify_userid }}:{{ trove_oslomsg_notify_password }}@{{ host }}:{{ trove_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ trove_oslomsg_notify_vhost }}{% endif %}{% endfor %}
{% include 'include_db.j2' %} {% include 'include_db.j2' %}