summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorviswesn <viswesn@gmail.com>2016-10-27 14:32:27 +0530
committerviswesn <viswesn@gmail.com>2016-10-27 14:32:27 +0530
commitd6665ea1337e96f87d73fab49c9d95f566ef4f19 (patch)
tree13d283de14579af0503a8a4f16462a0307807cc1
parentf3153a14fd764c8ff497397062034d1c4d3b03bd (diff)
downloadcharm-murano-d6665ea1337e96f87d73fab49c9d95f566ef4f19.zip
charm-murano-d6665ea1337e96f87d73fab49c9d95f566ef4f19.tar.gz
charm-murano-d6665ea1337e96f87d73fab49c9d95f566ef4f19.tar.bz2
Updated reactive for io-murano and modified config.yaml defaults
-rw-r--r--src/config.yaml4
-rw-r--r--src/reactive/murano_handlers.py5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/config.yaml b/src/config.yaml
index b6308de..f29a6cd 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -28,10 +28,10 @@ options:
type: string
description: OpenStack Region
ext-network:
- default: ext-net
+ default: ext_net
type: string
description: External network to connect
router:
- default: default-router
+ default: default_router
type: string
description: Default router to connect
diff --git a/src/reactive/murano_handlers.py b/src/reactive/murano_handlers.py
index 919002d..37801dc 100644
--- a/src/reactive/murano_handlers.py
+++ b/src/reactive/murano_handlers.py
@@ -48,12 +48,13 @@ def render_config(*args):
# db_sync checks if sync has been done so rerunning is a noop
@reactive.when('config.rendered')
-def init_db(*args):
+def init_db():
with charm.provide_charm_instance() as charm_class:
charm_class.db_sync()
@reactive.when_not('io-murano.imported')
+@reactive.when('config.rendered')
@reactive.when(*COMPLETE_INTERFACE_STATES)
-def import_io_murano(*args):
+def import_io_murano():
murano.import_io_murano()
reactive.set_state('io-murano.imported')

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