openstack
/
charm-murano
Code Issues Proposed changes

Updated murano.conf for sslY

This commit is contained in:
viswesn 2016-11-07 19:01:38 +05:30
parent c37587adf7
commit cae0a79d81
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/templates/mitaka/murano.conf
View File

@ -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 }}

10
src/templates/parts/rabbitmq Normal file
View File

@ -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 -%}