Merge "Add variables for rabbitmq ssl configuration"

openstack/openstack-ansible-os_cloudkitty

Code Issues Proposed changes

Browse Source

This commit is contained in:

Zuul

2021年05月18日 16:18:06 +00:00

committed by Gerrit Code Review

parent a1f9c741c6 68e8d15cd5

commit 39feacfa43

2 changed files with 6 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml

View File

@@ -43,6 +43,8 @@ cloudkitty_oslomsg_rpc_port: "{{ oslomsg_rpc_port | default('5672') }}"

cloudkitty_oslomsg_rpc_use_ssl:"{{ oslomsg_rpc_use_ssl | default(False) }}"

cloudkitty_oslomsg_rpc_userid:cloudkitty

cloudkitty_oslomsg_rpc_vhost:/cloudkitty

cloudkitty_oslomsg_rpc_ssl_version:"{{ oslomsg_rpc_ssl_version | default('TLSv1_2') }}"

cloudkitty_oslomsg_rpc_ssl_ca_file:"{{ oslomsg_rpc_ssl_ca_file | default('') }}"

# Notify

cloudkitty_oslomsg_notify_host_group:"{{ oslomsg_notify_host_group | default('rabbitmq_all') }}"

@@ -54,6 +56,8 @@ cloudkitty_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }

cloudkitty_oslomsg_notify_userid:"{{ cloudkitty_oslomsg_rpc_userid }}"

cloudkitty_oslomsg_notify_password:"{{ cloudkitty_oslomsg_rpc_password }}"

cloudkitty_oslomsg_notify_vhost:"{{ cloudkitty_oslomsg_rpc_vhost }}"

cloudkitty_oslomsg_notify_ssl_version:"{{ oslomsg_notify_ssl_version | default('TLSv1_2') }}"

cloudkitty_oslomsg_notify_ssl_ca_file:"{{ oslomsg_notify_ssl_ca_file | default('') }}"

cloudkitty_system_group_name:cloudkitty

cloudkitty_system_user_name:cloudkitty

4
templates/cloudkitty.conf.j2

View File

@@ -8,7 +8,7 @@ notification_topics = {{ cloudkitty_notification_topics }}

use_journal = True

## Oslo Messaging RPC

transport_url = {{ cloudkitty_oslomsg_rpc_transport }}://{% for host in cloudkitty_oslomsg_rpc_servers.split(',') %}{{ cloudkitty_oslomsg_rpc_userid }}:{{ cloudkitty_oslomsg_rpc_password }}@{{ host }}:{{ cloudkitty_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ cloudkitty_oslomsg_rpc_vhost }}{% if (cloudkitty_oslomsg_rpc_use_ssl | lower) | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}

transport_url = {{ cloudkitty_oslomsg_rpc_transport }}://{% for host in cloudkitty_oslomsg_rpc_servers.split(',') %}{{ cloudkitty_oslomsg_rpc_userid }}:{{ cloudkitty_oslomsg_rpc_password }}@{{ host }}:{{ cloudkitty_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ cloudkitty_oslomsg_rpc_vhost }}{% if cloudkitty_oslomsg_rpc_use_ssl | bool %}?ssl=1&ssl_version={{ cloudkitty_oslomsg_rpc_ssl_version }}&ssl_ca_file={{ cloudkitty_oslomsg_rpc_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}

[api]

port = {{ cloudkitty_service_port }}

@@ -51,7 +51,7 @@ auth_section = keystone_authtoken

ssl = {{ cloudkitty_oslomsg_notify_use_ssl | bool }}

[oslo_messaging_notifications]

transport_url = {{ cloudkitty_oslomsg_notify_transport }}://{% for host in cloudkitty_oslomsg_notify_servers.split(',') %}{{ cloudkitty_oslomsg_notify_userid }}:{{ cloudkitty_oslomsg_notify_password }}@{{ host }}:{{ cloudkitty_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ cloudkitty_oslomsg_notify_vhost }}{% if (cloudkitty_oslomsg_notify_use_ssl | lower) | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}

transport_url = {{ cloudkitty_oslomsg_notify_transport }}://{% for host in cloudkitty_oslomsg_notify_servers.split(',') %}{{ cloudkitty_oslomsg_notify_userid }}:{{ cloudkitty_oslomsg_notify_password }}@{{ host }}:{{ cloudkitty_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ cloudkitty_oslomsg_notify_vhost }}{% if cloudkitty_oslomsg_notify_use_ssl | bool %}?ssl=1&ssl_version={{ cloudkitty_oslomsg_notify_ssl_version }}&ssl_ca_file={{ cloudkitty_oslomsg_notify_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}

[output]

pipeline = {{ cloudkitty_output_pipeline }}