From 326823c4d3661ee5cc329857eab65148aa1d8fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Wed, 2 Sep 2020 15:18:05 +0000
Subject: [PATCH] Revert "openstack-base: pin setuptools < 46 to get horizon
 working"

This reverts commit ca8b61516401d61d90e2940fa130c8f55a8b6e45.

This is to fix recent breakage caused by setuptools and virtualenv
incompatibilities.

Includes bifrost version bump to fix its building.

Change-Id: Ia6c415b18374cefa3f160229d1f58cb209df348e
Closes-Bug: #1893920
Depends-On: https://review.opendev.org/749576
---
 docker/openstack-base/Dockerfile.j2 | 5 -----
 kolla/common/config.py              | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 85e3c1826c..30427bbe1a 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -414,11 +414,6 @@ RUN ln -s openstack-base-source/* /requirements \
 
 ENV PATH /var/lib/kolla/venv/bin:$PATH
 
-# FIXME(hrw): pyScss used by Horizon fails to work with setuptools >= 46
-# it had last release in 2016 so probably no one will fix it.
-# So we need to be sure that we get older version of setuptools.
-RUN {{ macros.install_pip(['"setuptools<46"']) }}
-
 RUN {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }}
 
 {% endif %}
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 21040b9ae3..ade1eac8d8 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -323,7 +323,7 @@ SOURCES = {
     'bifrost-base': {
         'type': 'url',
         'location': ('$tarballs_base/bifrost/'
-                     'bifrost-7.2.1.tar.gz')},
+                     'bifrost-7.2.2.tar.gz')},
     'blazar-base': {
         'type': 'url',
         'location': ('$tarballs_base/blazar/'