openstack
/
kolla
Code Issues Proposed changes

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
This commit is contained in:
Mark Goddard 2017-02-22 21:59:53 +00:00
parent b6ee94f257
commit 7d31c4d89a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/bifrost/bifrost-base/Dockerfile.j2
View File

@ -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'] %}