From 09604a7492752c1e4afa9c0facfb4309e9862616 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Mon, 11 May 2020 15:29:37 +0000
Subject: [PATCH] base/centos: take care of whitespaces

Let's get rid of this warning:

Change-Id: I121e2ecb30ec6e8d1b6d88d9b921894438c3e094
INFO:kolla.common.utils.base:ESC[91m[WARNING]: Empty continuation line found in:
INFO:kolla.common.utils.base:    RUN dnf -y install centos-release-opstools epel-release dnf-plugins-core     && dnf config-manager --enable PowerTools     && dnf config-manager --disable centos-ceph-nautilus     && dnf config-manager --disable centos-nfs-ganesha28     && dnf config-manager --disable influxdb && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools && dnf -y distro-sync --security --sec-severity=Important --sec-severity=Critical
INFO:kolla.common.utils.base:[WARNING]: Empty continuation lines will become errors in a future release.
INFO:kolla.common.utils.base:ESC[0m
INFO:kolla.common.utils.base:Step 1/39 : FROM centos:8
---
 docker/base/Dockerfile.j2             | 21 +++++++++------------
 tests/templates/template_overrides.j2 |  6 +++---
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index a9ab2f58a0..74ccadbf2b 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -211,7 +211,7 @@ COPY ceph.repo /etc/yum.repos.d/
     'dnf-plugins-core'
 ] %}
 {% set base_centos_yum_repos_to_enable = [
-    'PowerTools'
+    'PowerTools',
 ] %}
 
 {% set base_centos_yum_repos_to_disable = [
@@ -225,17 +225,14 @@ COPY ceph.repo /etc/yum.repos.d/
     ] %}
 {% endif %}
 
-RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} \
-{%- for repo in base_centos_yum_repos_to_enable | customizable('centos_yum_repos_to_enable') %}
-    && dnf config-manager --enable {{ repo }} \
-{% endfor -%}
-{%- for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') %}
-    && dnf config-manager --disable {{ repo }} \
-{% endfor -%}
-{% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') -%}
-    && rpm --import {{ key }} \
-{% endfor -%}
-{% block base_centos_repo_overrides_post_yum -%}{% endblock -%}
+RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}
+
+{%- for repo in base_centos_yum_repos_to_enable | customizable('centos_yum_repos_to_enable') %} && dnf config-manager --enable {{ repo }} {% endfor -%}
+
+{%- for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') %} && dnf config-manager --disable {{ repo }} {% endfor -%}
+
+{%- for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') %} && rpm --import {{ key }} {% endfor %} \
+{% block base_centos_repo_overrides_post_yum %}{% endblock -%}
     && {{ macros.rpm_security_update(clean_package_cache) }}
 
     {%- endif %}
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2
index d3726bb5d4..48941f6768 100644
--- a/tests/templates/template_overrides.j2
+++ b/tests/templates/template_overrides.j2
@@ -41,8 +41,8 @@ RUN sed -i \
 {% raw %}
 {% endblock %}
 
-{% block base_centos_repo_overrides_post_yum %}
-{% endraw %}
+{% block base_centos_repo_overrides_post_yum -%}
+{%- endraw -%}
     && sed -i \
         -e "/^mirrorlist/ d" \
         -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
@@ -55,7 +55,7 @@ RUN sed -i \
         -e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|" \
         -e "s|^#baseurl=https://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|" \
         /etc/yum.repos.d/epel*.repo \
-{% raw %}
+{%- raw -%}
 {% endblock %}
 
 {% block base_debian_after_sources_list %}