openstack
/
designate
Code Issues Proposed changes

DevStack: Support installing client at released versions 

See I26fac0ccf8fd4818e24618d56bf04b32306f88f6 for similar devstack
repo changes, and I27a56222c7e8e610fba8bf97672d2a42f5cf14ca for minor
fixes.

Change-Id: I99602ffdbbb38b13e29edcf54b9134f75746a22b
This commit is contained in:
Kiall Mac Innes 2015-07-13 13:36:37 +01:00
parent e97ccd33b8
commit 2e4f9ee7d5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/devstack/lib/designate
View File

@ -25,15 +25,14 @@ DESIGNATE_PLUGINS=$TOP_DIR/lib/designate_plugins
# Set up default repos
DESIGNATE_REPO=${DESIGNATE_REPO:-${GIT_BASE}/openstack/designate.git}
DESIGNATE_BRANCH=${DESIGNATE_BRANCH:-master}
DESIGNATECLIENT_REPO=${DESIGNATECLIENT_REPO:-${GIT_BASE}/openstack/python-designateclient.git}
DESIGNATECLIENT_BRANCH=${DESIGNATECLIENT_BRANCH:-master}
DESIGNATEDASHBOARD_REPO=${DESIGNATEDASHBOARD_REPO:-${GIT_BASE}/openstack/designate-dashboard.git}
DESIGNATEDASHBOARD_BRANCH=${DESIGNATEDASHBOARD_BRANCH:-master}
# Set up default paths
GITDIR["python-designateclient"]=$DEST/python-designateclient
DESIGNATE_BIN_DIR=$(get_python_exec_prefix)
DESIGNATE_DIR=$DEST/designate
DESIGNATECLIENT_DIR=$DEST/python-designateclient
DESIGNATEDASHBOARD_DIR=$DEST/designate-dashboard
DESIGNATE_CONF_DIR=/etc/designate
DESIGNATE_STATE_PATH=${DESIGNATE_STATE_PATH:=$DATA_DIR/designate}
@ -281,8 +280,12 @@ function install_designate {
# install_designateclient - Collect source and prepare
function install_designateclient {
git_clone $DESIGNATECLIENT_REPO $DESIGNATECLIENT_DIR $DESIGNATECLIENT_BRANCH
setup_develop $DESIGNATECLIENT_DIR
if use_library_from_git "python-designateclient"; then
git_clone_by_name "python-designateclient"
setup_dev_lib "python-designateclient"
else
pip_install_gr "python-designateclient"
fi
}
# install_designatedashboard - Collect source and prepare