openstack/deb-gnocchi
Code Issues Proposed changes

Don't reclone the repo we already did

Browse Source 
In order to use a devstack plugin at all, we first must have cloned
the gnocchi repo pointed to in local.conf. This sets the remote and
the chosen branch. install_config then goes on to clone again,
clobbering the thing that just got checked out, including and
customizations that are being tested.

So, just get rid of the redundancy.

Change-Id: Ia60273ca73a351ba01f335ff79d5964ae3ddd6be
This commit is contained in:
Chris Dent 2015-06-24 14:34:55 +01:00
parent 41a3ef2696
commit 7d5f2d66dc
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/plugin.sh
View File

@ -35,10 +35,6 @@ set +o xtrace
# Defaults # Defaults
# -------- # --------
# Setup repository
GNOCCHI_REPO=${GNOCCHI_REPO:-${GIT_BASE}/openstack/gnocchi.git}
GNOCCHI_BRANCH=${GNOCCHI_BRANCH:-master}
# Set up default directories # Set up default directories
GNOCCHI_DIR=$DEST/gnocchi GNOCCHI_DIR=$DEST/gnocchi
GNOCCHI_CONF_DIR=/etc/gnocchi GNOCCHI_CONF_DIR=/etc/gnocchi
@ -270,8 +266,6 @@ function init_gnocchi {
# install_gnocchi() - Collect source and prepare # install_gnocchi() - Collect source and prepare
function install_gnocchi { function install_gnocchi {
git_clone $GNOCCHI_REPO $GNOCCHI_DIR $GNOCCHI_BRANCH
if [ "${GNOCCHI_COORDINATOR_URL%%:*}" == "redis" ]; then if [ "${GNOCCHI_COORDINATOR_URL%%:*}" == "redis" ]; then
# NOTE(sileht): this is defined into ceilometer lib # NOTE(sileht): this is defined into ceilometer lib
install_redis install_redis