summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorviswesn <viswesn@gmail.com>2016-10-24 13:41:53 +0530
committerviswesn <viswesn@gmail.com>2016-10-24 13:41:53 +0530
commite5ae11934108172e52a3712aa694ace0fe467b93 (patch)
tree69bfc74b465b068c4bdb17fc4f69fd433d59731d
parentd2829d40251c93ff643b70f05eb155324b8f2004 (diff)
downloadcharm-murano-e5ae11934108172e52a3712aa694ace0fe467b93.zip
charm-murano-e5ae11934108172e52a3712aa694ace0fe467b93.tar.gz
charm-murano-e5ae11934108172e52a3712aa694ace0fe467b93.tar.bz2
Updated murano.conf and murano.py
-rw-r--r--src/templates/mitaka/murano.conf18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/templates/mitaka/murano.conf b/src/templates/mitaka/murano.conf
index 2ab471a..656ea9e 100644
--- a/src/templates/mitaka/murano.conf
+++ b/src/templates/mitaka/murano.conf
@@ -4,6 +4,18 @@ 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 }}
+
+[oslo_messaging_notifications]
+driver=messagingv2
+
[database]
connection = {{ shared_db.uri }}
@@ -25,7 +37,11 @@ username = {{ identity_service.service_username }}
password = {{ identity_service.service_password }}
{%- endif %}
-{% include "parts/section-rabbitmq-oslo" %}
+[rabbitmq]
+host = {{ amqp.host }}
+login = {{ amqp.username }}
+password = {{ amqp.password }}
+virtual_host = {{ amqp.vhost }}
[murano]
url = {{ options.external_endpoints.murano_api.url }}

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