summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorviswesn <viswesn@gmail.com>2016-11-04 15:11:26 +0530
committerviswesn <viswesn@gmail.com>2016-11-04 15:11:26 +0530
commitb1e6c3859556bdf8a8cdef02da620f7040c496fc (patch)
tree59e1b7ae1f3f9f14f54d0d8aff902c2698107aae
parentbf87915ec5a80837961cd65a4aef42f6b8842435 (diff)
downloadcharm-murano-b1e6c3859556bdf8a8cdef02da620f7040c496fc.zip
charm-murano-b1e6c3859556bdf8a8cdef02da620f7040c496fc.tar.gz
charm-murano-b1e6c3859556bdf8a8cdef02da620f7040c496fc.tar.bz2
Support for default dns in murano.conf
-rw-r--r--src/config.yaml4
-rw-r--r--src/templates/mitaka/murano.conf1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/config.yaml b/src/config.yaml
index f29a6cd..abb2803 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -35,3 +35,7 @@ options:
default: default_router
type: string
description: Default router to connect
+ default_dns:
+ default: 8.8.8.8
+ type: string
+ description: Default DNS configuration
diff --git a/src/templates/mitaka/murano.conf b/src/templates/mitaka/murano.conf
index 18da82b..370ef89 100644
--- a/src/templates/mitaka/murano.conf
+++ b/src/templates/mitaka/murano.conf
@@ -50,3 +50,4 @@ url = {{ options.external_endpoints.murano_api.url }}
external_network = {{ options.ext_network }}
router_name = {{ options.router }}
create_router = true
+default_dns = {{ options.default_dns }}

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