From 6fba9d6785e3b0a4b4c55475e29a16a8b0ceb0be Mon Sep 17 00:00:00 2001 From: Ravi Sankar Penta Date: Mon, 18 Aug 2014 14:33:12 -0700 Subject: [PATCH] Allow devstack to do git clone of barbican Currently on F20 env when devstack tries to install barbican and barbicanclient, it's failing as corresponding dir doesn't exist and ERROR_ON_CLONE=True. As barbican is not part of devstack yet, we don't expect this dir to be present in this case, we should set ERROR_ON_CLONE=False to allow devstack to do git clone. Related-Bug: #1353696 Change-Id: I3c362f1b2e6c9abf940ea68a12085dd747ede37c --- contrib/devstack/lib/barbican | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/devstack/lib/barbican b/contrib/devstack/lib/barbican index 3f7875d8a..f6548106e 100755 --- a/contrib/devstack/lib/barbican +++ b/contrib/devstack/lib/barbican @@ -142,6 +142,8 @@ function install_barbican { if is_fedora; then install_package sqlite-devel fi + # TODO(ravips): We need this until barbican gets into devstack + ERROR_ON_CLONE=False git_clone $BARBICAN_REPO $BARBICAN_DIR $BARBICAN_BRANCH setup_develop $BARBICAN_DIR pip_install 'uwsgi' @@ -149,6 +151,8 @@ function install_barbican { # install_barbicanclient - Collect source and prepare function install_barbicanclient { + # TODO(ravips): We need this until barbican gets into devstack + ERROR_ON_CLONE=False git_clone $BARBICANCLIENT_REPO $BARBICANCLIENT_DIR $BARBICANCLIENT_BRANCH setup_develop $BARBICANCLIENT_DIR }