From d18255e5e2ecb3b595f921248188ae0010078aa6 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 23 Sep 2015 13:55:19 -0700 Subject: [PATCH] Remove ERROR_ON_CLONE references It is *never* acceptable to manipulate this variable. It defeats devstack gate testing. Change-Id: Iea79f237a9b1daf3c4352fb0e2b5b78a58203b02 --- contrib/devstack/lib/barbican | 4 ---- devstack/lib/barbican | 2 -- 2 files changed, 6 deletions(-) diff --git a/contrib/devstack/lib/barbican b/contrib/devstack/lib/barbican index 4aa7c05d3..5bf5ab4c4 100755 --- a/contrib/devstack/lib/barbican +++ b/contrib/devstack/lib/barbican @@ -188,8 +188,6 @@ function install_barbican { if is_fedora; then install_package sqlite-devel openldap-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' @@ -197,8 +195,6 @@ 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 } diff --git a/devstack/lib/barbican b/devstack/lib/barbican index db42f3f8d..7c564cae8 100644 --- a/devstack/lib/barbican +++ b/devstack/lib/barbican @@ -167,8 +167,6 @@ 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 }