diff --git a/defaults/main.yml b/defaults/main.yml index 47844ee..b917846 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -153,6 +153,8 @@ zun_oslomsg_rpc_port: "{{ oslomsg_rpc_port | default('5672') }}" zun_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl | default(False) }}" zun_oslomsg_rpc_userid: zun zun_oslomsg_rpc_vhost: /zun +zun_oslomsg_rpc_ssl_version: "{{ oslomsg_rpc_ssl_version | default('TLSv1_2') }}" +zun_oslomsg_rpc_ssl_ca_file: "{{ oslomsg_rpc_ssl_ca_file | default('') }}" # Notify zun_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}" @@ -164,6 +166,8 @@ zun_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}" zun_oslomsg_notify_userid: "{{ zun_oslomsg_rpc_userid }}" zun_oslomsg_notify_password: "{{ zun_oslomsg_rpc_password }}" zun_oslomsg_notify_vhost: "{{ zun_oslomsg_rpc_vhost }}" +zun_oslomsg_notify_ssl_version: "{{ oslomsg_notify_ssl_version | default('TLSv1_2') }}" +zun_oslomsg_notify_ssl_ca_file: "{{ oslomsg_notify_ssl_ca_file | default('') }}" # If this is not set, then the playbook will try to guess it. #zun_virt_type: kvm diff --git a/templates/zun.conf.j2 b/templates/zun.conf.j2 index 4520ad0..3398a48 100644 --- a/templates/zun.conf.j2 +++ b/templates/zun.conf.j2 @@ -2,7 +2,7 @@ debug = {{ debug | bool }} use_journal = true rpc_conn_pool_size = {{ zun_rpc_conn_pool_size }} -transport_url = {{ zun_oslomsg_rpc_transport }}://{% for host in zun_oslomsg_rpc_servers.split(',') %}{{ zun_oslomsg_rpc_userid }}:{{ zun_oslomsg_rpc_password }}@{{ host }}:{{ zun_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ zun_oslomsg_rpc_vhost }}{% if (zun_oslomsg_rpc_use_ssl | lower) | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} +transport_url = {{ zun_oslomsg_rpc_transport }}://{% for host in zun_oslomsg_rpc_servers.split(',') %}{{ zun_oslomsg_rpc_userid }}:{{ zun_oslomsg_rpc_password }}@{{ host }}:{{ zun_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ zun_oslomsg_rpc_vhost }}{% if zun_oslomsg_rpc_use_ssl | bool %}?ssl=1&ssl_version={{ zun_oslomsg_rpc_ssl_version }}&ssl_ca_file={{ zun_oslomsg_rpc_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} use_sandbox = true image_driver_list = glance,docker @@ -85,7 +85,7 @@ lock_path = /var/lib/zun/tmp [oslo_messaging_notifications] driver = {{ (zun_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }} -transport_url = {{ zun_oslomsg_notify_transport }}://{% for host in zun_oslomsg_notify_servers.split(',') %}{{ zun_oslomsg_notify_userid }}:{{ zun_oslomsg_notify_password }}@{{ host }}:{{ zun_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ zun_oslomsg_notify_vhost }}{% if (zun_oslomsg_notify_use_ssl | lower) | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} +transport_url = {{ zun_oslomsg_notify_transport }}://{% for host in zun_oslomsg_notify_servers.split(',') %}{{ zun_oslomsg_notify_userid }}:{{ zun_oslomsg_notify_password }}@{{ host }}:{{ zun_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ zun_oslomsg_notify_vhost }}{% if zun_oslomsg_notify_use_ssl | bool %}?ssl=1&ssl_version={{ zun_oslomsg_notify_ssl_version }}&ssl_ca_file={{ zun_oslomsg_notify_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} {% if zun_ceilometer_enabled or zun_designate_enabled %} {% set notification_topics = [] %} {% if neutron_ceilometer_enabled %}