aboutsummaryrefslogtreecommitdiff
path: root/docker/bifrost
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-12-17 23:26:52 +0000
committerGerrit Code Review <review@openstack.org>2019-12-17 23:26:52 +0000
commit6f4e98c67898dea4834abf1cc435848247ee7c44 (patch)
treed79f7a4544a1e08697995dc18951faebd279e240 /docker/bifrost
parent540b0cf6d7da4f7a85c54af847d4f519471d6e27 (diff)
parent5e4ade198f794e79ee02a21f77dddd9f1fd2d16e (diff)
downloadkolla-6f4e98c67898dea4834abf1cc435848247ee7c44.tar.gz
kolla-6f4e98c67898dea4834abf1cc435848247ee7c44.zip
Merge "docker: fix 'Empty continuation line found' warnings"
Diffstat (limited to 'docker/bifrost')
-rw-r--r--docker/bifrost/bifrost-base/Dockerfile.j212
1 files changed, 6 insertions, 6 deletions
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2
index 6b9f5f4d4..8cf1b62d6 100644
--- a/docker/bifrost/bifrost-base/Dockerfile.j2
+++ b/docker/bifrost/bifrost-base/Dockerfile.j2
@@ -39,19 +39,19 @@ RUN sed -e "s/.*mariadb.*//Ig" -e "s/.*rabbitmq.*//Ig" -i /etc/apt/sources.list
ENV ANSIBLE_GATHER_TIMEOUT=30
{% block bifrost_ansible_install %}
-{% if base_package_type == 'deb' %}
+{%- if base_package_type == 'deb' %}
RUN apt-get update && \
-{% else %}
+{%- else %}
RUN echo " " && \
-{% endif %}
+{%- endif %}
bash -c './scripts/env-setup.sh && source ./env-vars && \
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \
-e @/tmp/build_arg.yml && \
-{% if base_package_type == 'deb' %}
+{%- if base_package_type == 'deb' %}
apt-get clean && rm -rf /var/lib/apt/lists/*'
-{% else %}
+{%- else %}
yum clean all && rm -rf /var/yum/cache'
-{% endif %}
+{%- endif %}
{% endblock %}
{% endif %}