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
 }