diff options
| author | Zuul <zuul@review.openstack.org> | 2019-01-25 10:58:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-01-25 10:58:48 +0000 |
| commit | df5da720546faa88c4da8b5f1c9a1db63a55fa01 (patch) | |
| tree | 86e18cf438071d306c6cd9daf82ffb0fb1edd900 /docker | |
| parent | 819924a8e5f1609f0224a6ab56c3bad0b57dab44 (diff) | |
| parent | e1ee85a560ceca1a4e5eb6052df0335d3dff4765 (diff) | |
| download | kolla-df5da720546faa88c4da8b5f1c9a1db63a55fa01.tar.gz kolla-df5da720546faa88c4da8b5f1c9a1db63a55fa01.zip | |
Merge "Increase gather_facts timeout"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 6a96fdd45..6b9f5f4d4 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -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* {% endif %} +{# ANSIBLE_GATHER_TIMEOUT is a workaround for https://github.com/ansible/ansible/issues/43884 #} +ENV ANSIBLE_GATHER_TIMEOUT=30 + {% block bifrost_ansible_install %} {% if base_package_type == 'deb' %} RUN apt-get update && \ |