openstack/kolla
Code Issues Proposed changes

Merge "Increase gather_facts timeout"

Browse Source
This commit is contained in:
Zuul 2019-01-25 10:58:48 +00:00 committed by Gerrit Code Review
commit df5da72054
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,9 @@ RUN sed -e "s/.*mariadb.*//Ig" -e "s/.*rabbitmq.*//Ig" -i /etc/apt/sources.list
&& apt-get purge -y mariadb* mysql* && apt-get purge -y mariadb* mysql*
{% endif %} {% endif %}
{# ANSIBLE_GATHER_TIMEOUT is a workaround for https://github.com/ansible/ansible/issues/43884 #}
ENV ANSIBLE_GATHER_TIMEOUT=30
{% block bifrost_ansible_install %} {% block bifrost_ansible_install %}
{% if base_package_type == 'deb' %} {% if base_package_type == 'deb' %}
RUN apt-get update && \ RUN apt-get update && \