From 68e8d15cd5460a85d7495b6dcfa76020ddac7bb4 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 17 May 2021 09:24:28 +0000 Subject: [PATCH] Add variables for rabbitmq ssl configuration Change-Id: If8362185261aefa741f9c21c57b3dfe258d8543d --- defaults/main.yml | 4 ++++ templates/cloudkitty.conf.j2 | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index a4ace55..105bfcd 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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 diff --git a/templates/cloudkitty.conf.j2 b/templates/cloudkitty.conf.j2 index ae75939..0fe1d88 100644 --- a/templates/cloudkitty.conf.j2 +++ b/templates/cloudkitty.conf.j2 @@ -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 }}