summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorviswesn <viswesn@gmail.com>2016-11-07 19:01:38 +0530
committerviswesn <viswesn@gmail.com>2016-11-07 19:01:38 +0530
commitcae0a79d81f98ce1474cc645034df7ce435cf54c (patch)
tree751d4a8672286a69f518a2581137cba46e86d5b9
parentc37587adf72734eac8cc7b9904519dffd287e3d9 (diff)
downloadcharm-murano-cae0a79d81f98ce1474cc645034df7ce435cf54c.zip
charm-murano-cae0a79d81f98ce1474cc645034df7ce435cf54c.tar.gz
charm-murano-cae0a79d81f98ce1474cc645034df7ce435cf54c.tar.bz2
Updated murano.conf for sslY
-rw-r--r--src/templates/mitaka/murano.conf16
-rw-r--r--src/templates/parts/rabbitmq10
2 files changed, 16 insertions, 10 deletions
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 -%}

This mirror site include all the OpenStack related repositories under: openstack, openstack-dev and openstack-infra.

NOTE: All repositories are updated every one hour.

Usage

For Git Clone
 git clone http://git.trystack.cn/openstack/nova.git 
For DevStack

Add GIT_BASE, NOVNC_REPO and SPICE_REPO variables to local.conf file.

[[local|localrc]]

# use TryStack git mirror
GIT_BASE=http://git.trystack.cn
NOVNC_REPO=http://git.trystack.cn/kanaka/noVNC.git
SPICE_REPO=http://git.trystack.cn/git/spice/spice-html5.git