From cae0a79d81f98ce1474cc645034df7ce435cf54c Mon Sep 17 00:00:00 2001 From: viswesn Date: Mon, 7 Nov 2016 19:01:38 +0530 Subject: [PATCH] Updated murano.conf for sslY --- src/templates/mitaka/murano.conf | 16 ++++++---------- src/templates/parts/rabbitmq | 10 ++++++++++ 2 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 src/templates/parts/rabbitmq diff --git a/src/templates/mitaka/murano.conf b/src/templates/mitaka/murano.conf index 370ef89..9188952 100644 --- a/src/templates/mitaka/murano.conf +++ b/src/templates/mitaka/murano.conf @@ -1,17 +1,8 @@ [DEFAULT] debug = {{ options.debug }} - bind_host = {{ options.service_listen_info.murano_api.ip }} bind_port = {{ options.service_listen_info.murano_api.port }} - -{% if amqp.hosts -%} -rabbit_hosts = {{ amqp.hosts }} -{% else -%} -rabbit_host = {{ amqp.host }} -{% endif -%} -rabbit_userid = {{ amqp.username }} -rabbit_password = {{ amqp.password }} -rabbit_virtual_host = {{ amqp.vhost }} +{% include "parts/rabbitmq" %} [oslo_messaging_notifications] driver=messagingv2 @@ -51,3 +42,8 @@ external_network = {{ options.ext_network }} router_name = {{ options.router }} create_router = true default_dns = {{ options.default_dns }} + +[ssl] +cert_file = {{ options.ssl_cert }} +key_file = {{ options.ssl_key }} +ca_file = {{ options.ssl_ca }} diff --git a/src/templates/parts/rabbitmq b/src/templates/parts/rabbitmq new file mode 100644 index 0000000..7082ed1 --- /dev/null +++ b/src/templates/parts/rabbitmq @@ -0,0 +1,10 @@ +{% if amqp.host or amqp.hosts -%} +rabbit_userid = {{ amqp.username }} +rabbit_password = {{ amqp.password }} +rabbit_virtual_host = {{ amqp.vhost }} +{% if amqp.hosts -%} +rabbit_hosts = {{ amqp.hosts }} +{% else -%} +rabbit_host = {{ amqp.host }} +{% endif -%} +{% endif -%}