openstack/murano
Code Issues Proposed changes

Update branches in libs and plugin for liberty release

Browse Source 
- Update murano branches in plugin
- Update murano branches in libs

Change-Id: I8c2a7a671c6fbcb536b9b320986756fc776bdba1
Closes-Bug: #1500415
This commit is contained in:
Victor Ryzhenkin 2015-09-28 15:20:11 +03:00
parent 70631d9892
commit a7fbbf2e57
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/devstack/lib/murano
View File

@ -22,10 +22,10 @@ set -o xtrace
# Set up default repos
MURANO_REPO=${MURANO_REPO:-${GIT_BASE}/openstack/murano.git}
MURANO_BRANCH=${MURANO_BRANCH:-master}
MURANO_BRANCH=${MURANO_BRANCH:-stable/liberty}
GITREPO["python-muranoclient"]=${MURANO_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-muranoclient.git}
GITBRANCH["python-muranoclient"]=${MURANO_PYTHONCLIENT_BRANCH:-master}
GITBRANCH["python-muranoclient"]=${MURANO_PYTHONCLIENT_BRANCH:-stable/liberty}
GITDIR["python-muranoclient"]=$DEST/python-muranoclient
# Set up default directories

2
contrib/devstack/lib/murano-dashboard
View File

@ -28,7 +28,7 @@ HORIZON_LOCAL_CONFIG=${HORIZON_LOCAL_CONFIG:-$HORIZON_DIR/openstack_dashboard/lo
# Set up default repos
MURANO_DASHBOARD_REPO=${MURANO_DASHBOARD_REPO:-${GIT_BASE}/openstack/murano-dashboard.git}
MURANO_DASHBOARD_BRANCH=${MURANO_DASHBOARD_BRANCH:-master}
MURANO_DASHBOARD_BRANCH=${MURANO_DASHBOARD_BRANCH:-stable/liberty}
# Set up default directories
MURANO_DASHBOARD_DIR=$DEST/murano-dashboard

6
devstack/plugin.sh
View File

@ -16,12 +16,12 @@ set -o xtrace
# Set up default repos
MURANO_REPO=${MURANO_REPO:-${GIT_BASE}/openstack/murano.git}
MURANO_BRANCH=${MURANO_BRANCH:-master}
MURANO_BRANCH=${MURANO_BRANCH:-stable/liberty}
# Variables, which used in this function
# https://github.com/openstack-dev/devstack/blob/master/functions-common#L500-L506
GITREPO["python-muranoclient"]=${MURANO_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-muranoclient.git}
GITBRANCH["python-muranoclient"]=${MURANO_PYTHONCLIENT_BRANCH:-master}
GITBRANCH["python-muranoclient"]=${MURANO_PYTHONCLIENT_BRANCH:-stable/liberty}
GITDIR["python-muranoclient"]=$DEST/python-muranoclient
# Set up default directories
@ -270,7 +270,7 @@ HORIZON_LOCAL_CONFIG=${HORIZON_LOCAL_CONFIG:-$HORIZON_DIR/openstack_dashboard/lo
# Set up default repos
MURANO_DASHBOARD_REPO=${MURANO_DASHBOARD_REPO:-${GIT_BASE}/openstack/murano-dashboard.git}
MURANO_DASHBOARD_BRANCH=${MURANO_DASHBOARD_BRANCH:-master}
MURANO_DASHBOARD_BRANCH=${MURANO_DASHBOARD_BRANCH:-stable/liberty}
# Set up default directories
MURANO_DASHBOARD_DIR=$DEST/murano-dashboard