openstack
/
tacker
Code Issues Proposed changes

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
This commit is contained in:
Manpreet Kaur 2020-10-13 18:03:06 +00:00
parent 21bbf57372
commit f8fb331a45
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.zuul.yaml
View File

@ -47,9 +47,7 @@
- openstack/blazar - openstack/blazar
- openstack/blazar-nova - openstack/blazar-nova
- openstack/horizon - openstack/horizon
# Temporarily remove because of Ubuntu Focal Migration issue - openstack/barbican
# https://storyboard.openstack.org/#!/story/2007732
# - openstack/barbican
# Temporarily remove because of Ubuntu Focal Migration issue # Temporarily remove because of Ubuntu Focal Migration issue
# https://storyboard.openstack.org/#!/story/2008121 # https://storyboard.openstack.org/#!/story/2008121
# https://review.opendev.org/#/c/752294/ # https://review.opendev.org/#/c/752294/
@ -58,9 +56,7 @@
- openstack/mistral - openstack/mistral
- openstack/mistral-dashboard - openstack/mistral-dashboard
- openstack/networking-sfc - openstack/networking-sfc
# Temporarily remove because of Ubuntu Focal Migration issue - openstack/python-barbicanclient
# https://storyboard.openstack.org/#!/story/2007732
# - openstack/python-barbicanclient
- openstack/python-blazarclient - openstack/python-blazarclient
- openstack/python-mistralclient - openstack/python-mistralclient
- openstack/python-tackerclient - openstack/python-tackerclient
@ -92,9 +88,7 @@
# https://storyboard.openstack.org/#!/story/2008121 # https://storyboard.openstack.org/#!/story/2008121
# https://review.opendev.org/#/c/752294/ # https://review.opendev.org/#/c/752294/
# ceilometer: https://opendev.org/openstack/ceilometer # ceilometer: https://opendev.org/openstack/ceilometer
# Temporarily remove because of Ubuntu Focal Migration issue barbican: https://opendev.org/openstack/barbican
# https://storyboard.openstack.org/#!/story/2007732
# barbican: https://opendev.org/openstack/barbican
mistral: https://opendev.org/openstack/mistral mistral: https://opendev.org/openstack/mistral
tacker: https://opendev.org/openstack/tacker tacker: https://opendev.org/openstack/tacker
blazar: https://opendev.org/openstack/blazar blazar: https://opendev.org/openstack/blazar

4
devstack/settings
View File

@ -1,7 +1,5 @@
TACKER_MODE=${TACKER_MODE:-all} TACKER_MODE=${TACKER_MODE:-all}
# Temporarily change because of Ubuntu Focal Migration issue USE_BARBICAN=True
# https://storyboard.openstack.org/#!/story/2007732
USE_BARBICAN=False
KUBERNETES_VIM=${KUBERNETES_VIM:-False} KUBERNETES_VIM=${KUBERNETES_VIM:-False}
if [ "${TACKER_MODE}" == "all" ]; then if [ "${TACKER_MODE}" == "all" ]; then