diff --git a/defaults/main.yml b/defaults/main.yml index 29ec06e..ae22c9d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -102,6 +102,8 @@ magnum_oslomsg_rpc_port: "{{ oslomsg_rpc_port | default('5672') }}" magnum_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl | default(False) }}" magnum_oslomsg_rpc_userid: magnum magnum_oslomsg_rpc_vhost: /magnum +magnum_oslomsg_rpc_ssl_version: "{{ oslomsg_rpc_ssl_version | default('TLSv1_2') }}" +magnum_oslomsg_rpc_ssl_ca_file: "{{ oslomsg_rpc_ssl_ca_file | default('') }}" # Notify magnum_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}" @@ -113,6 +115,8 @@ magnum_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}" magnum_oslomsg_notify_userid: "{{ magnum_oslomsg_rpc_userid }}" magnum_oslomsg_notify_password: "{{ magnum_oslomsg_rpc_password }}" magnum_oslomsg_notify_vhost: "{{ magnum_oslomsg_rpc_vhost }}" +magnum_oslomsg_notify_ssl_version: "{{ oslomsg_notify_ssl_version | default('TLSv1_2') }}" +magnum_oslomsg_notify_ssl_ca_file: "{{ oslomsg_notify_ssl_ca_file | default('') }}" ## (Qdrouterd) integration # TODO(ansmith): Change structure when more backends will be supported diff --git a/templates/magnum.conf.j2 b/templates/magnum.conf.j2 index 40f87d3..7026818 100644 --- a/templates/magnum.conf.j2 +++ b/templates/magnum.conf.j2 @@ -4,7 +4,7 @@ use_stderr = False debug = {{ debug }} use_journal = True host = {{ ansible_host }} -transport_url = {{ magnum_oslomsg_rpc_transport }}://{% for host in magnum_oslomsg_rpc_servers.split(',') %}{{ magnum_oslomsg_rpc_userid }}:{{ magnum_oslomsg_rpc_password }}@{{ host }}:{{ magnum_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ magnum_oslomsg_rpc_vhost }}{% if magnum_oslomsg_rpc_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} +transport_url = {{ magnum_oslomsg_rpc_transport }}://{% for host in magnum_oslomsg_rpc_servers.split(',') %}{{ magnum_oslomsg_rpc_userid }}:{{ magnum_oslomsg_rpc_password }}@{{ host }}:{{ magnum_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ magnum_oslomsg_rpc_vhost }}{% if magnum_oslomsg_rpc_use_ssl | bool %}?ssl=1&ssl_version={{ magnum_oslomsg_rpc_ssl_version }}&ssl_ca_file={{ magnum_oslomsg_rpc_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} [api] host = {{ ansible_host }} @@ -65,7 +65,7 @@ endpoint_type = internalURL [oslo_messaging_notifications] driver = {{ (magnum_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }} -transport_url = {{ magnum_oslomsg_notify_transport }}://{% for host in magnum_oslomsg_notify_servers.split(',') %}{{ magnum_oslomsg_notify_userid }}:{{ magnum_oslomsg_notify_password }}@{{ host }}:{{ magnum_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ magnum_oslomsg_notify_vhost }}{% if magnum_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} +transport_url = {{ magnum_oslomsg_notify_transport }}://{% for host in magnum_oslomsg_notify_servers.split(',') %}{{ magnum_oslomsg_notify_userid }}:{{ magnum_oslomsg_notify_password }}@{{ host }}:{{ magnum_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ magnum_oslomsg_notify_vhost }}{% if magnum_oslomsg_notify_use_ssl | bool %}?ssl=1&ssl_version={{ magnum_oslomsg_notify_ssl_version }}&ssl_ca_file={{ magnum_oslomsg_notify_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} [oslo_messaging_rabbit] ssl = {{ magnum_oslomsg_rpc_use_ssl }}