From 7d31c4d89a9775eb884e0baf4755e9ef71a072c1 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 22 Feb 2017 21:59:53 +0000 Subject: [PATCH] Workaround for setuptools bug affecting Bifrost bifrost-3.0.0 is affected by a setuptools bug preventing it from being installed. This change patches Bifrost with the workaround committed to the Bifrost master branch in https://review.openstack.org/#/c/437010/. If/when that change gets backported to Bifrost stable/ocata and then released as 3.0.1, we can remove this workaround. Change-Id: I257abd86599304ef1992d10da20130c9b7c25e46 Closes-Bug: #1667308 --- docker/bifrost/bifrost-base/Dockerfile.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 796b063189..9323d63d3b 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -26,7 +26,9 @@ WORKDIR /bifrost RUN sed -e "s/.*mariadb.*//Ig" -i /etc/apt/sources.list && apt-get purge -y mariadb* mysql* {% endif %} -RUN bash -c './scripts/env-setup.sh && source ./env-vars && \ + +RUN bash -c 'sed -e "s/\-\-force\-reinstall //g" -i /bifrost/playbooks/roles/bifrost-{ironic,keystone}-install/tasks/install.yml' \ + && bash -c './scripts/env-setup.sh && source ./env-vars && \ ansible-playbook -vvvv -i /bifrost/playbooks/inventory/localhost /bifrost/playbooks/install.yaml \ -e @/tmp/build_arg.yml && \ {% if base_distro in ['ubuntu', 'debian'] %}