summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorViswesuwara Nathan SSK <viswesn@gmail.com>2016-11-10 16:04:31 +0530
committerGitHub <noreply@github.com>2016-11-10 16:04:31 +0530
commit4c6339e28abe695abee5ba71611cd15bd5feba5c (patch)
tree2a8d2115ff768c1fb00fae69eb2577a92bad2316
parentaac04c8efd595be03460eb0586f2de8bdb0db734 (diff)
downloadcharm-murano-4c6339e28abe695abee5ba71611cd15bd5feba5c.zip
charm-murano-4c6339e28abe695abee5ba71611cd15bd5feba5c.tar.gz
charm-murano-4c6339e28abe695abee5ba71611cd15bd5feba5c.tar.bz2
Update murano.conf
-rw-r--r--src/templates/mitaka/murano.conf8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/templates/mitaka/murano.conf b/src/templates/mitaka/murano.conf
index 663952c..08735d7 100644
--- a/src/templates/mitaka/murano.conf
+++ b/src/templates/mitaka/murano.conf
@@ -11,7 +11,6 @@ driver=messagingv2
connection = {{ shared_db.uri }}
{% include "parts/section-keystone-authtoken" %}
-
{% if identity_service.auth_host -%}
admin_user = {{ identity_service.service_username }}
admin_password = {{ identity_service.service_password }}
@@ -34,6 +33,8 @@ login = {{ amqp.username }}
password = {{ amqp.password }}
virtual_host = {{ amqp.vhost }}
+{% include "parts/section-rabbitmq-oslo" %}
+
[murano]
url = {{ options.external_endpoints.murano_api.url }}
@@ -42,8 +43,3 @@ 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 }}

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