From f8fb331a45386603ac9d6fd08212450618bd418b Mon Sep 17 00:00:00 2001
From: Manpreet Kaur <kaurmanpreet2620@gmail.com>
Date: Tue, 13 Oct 2020 18:03:06 +0000
Subject: [PATCH] Revert Barbican install

Revert Barbican install which was removed in the following
workaround.
https://review.opendev.org/#/c/751965/

Related to https://storyboard.openstack.org/#!/story/2008121
This has been fix in https://review.opendev.org/#/c/753699/4

Change-Id: Icb96354cd263990bc8d179f5c635d7522e72910e
---
 .zuul.yaml        | 12 +++---------
 devstack/settings |  4 +---
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 4cc6a93c0..1b6adeb76 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -47,9 +47,7 @@
       - openstack/blazar
       - openstack/blazar-nova
       - openstack/horizon
-      # Temporarily remove because of Ubuntu Focal Migration issue
-      #   https://storyboard.openstack.org/#!/story/2007732
-      # - openstack/barbican
+      - openstack/barbican
       # Temporarily remove because of Ubuntu Focal Migration issue
       #   https://storyboard.openstack.org/#!/story/2008121
       #   https://review.opendev.org/#/c/752294/
@@ -58,9 +56,7 @@
       - openstack/mistral
       - openstack/mistral-dashboard
       - openstack/networking-sfc
-      # Temporarily remove because of Ubuntu Focal Migration issue
-      #   https://storyboard.openstack.org/#!/story/2007732
-      # - openstack/python-barbicanclient
+      - openstack/python-barbicanclient
       - openstack/python-blazarclient
       - openstack/python-mistralclient
       - openstack/python-tackerclient
@@ -92,9 +88,7 @@
           #   https://storyboard.openstack.org/#!/story/2008121
           #   https://review.opendev.org/#/c/752294/
           # ceilometer: https://opendev.org/openstack/ceilometer
-          # Temporarily remove because of Ubuntu Focal Migration issue
-          #   https://storyboard.openstack.org/#!/story/2007732
-          # barbican: https://opendev.org/openstack/barbican
+          barbican: https://opendev.org/openstack/barbican
           mistral: https://opendev.org/openstack/mistral
           tacker: https://opendev.org/openstack/tacker
           blazar: https://opendev.org/openstack/blazar
diff --git a/devstack/settings b/devstack/settings
index 1f4a4c3dd..e7564676b 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -1,7 +1,5 @@
 TACKER_MODE=${TACKER_MODE:-all}
-# Temporarily change because of Ubuntu Focal Migration issue
-#   https://storyboard.openstack.org/#!/story/2007732
-USE_BARBICAN=False
+USE_BARBICAN=True
 KUBERNETES_VIM=${KUBERNETES_VIM:-False}
 
 if [ "${TACKER_MODE}" == "all" ]; then