diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-17 23:26:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-17 23:26:52 +0000 |
| commit | 6f4e98c67898dea4834abf1cc435848247ee7c44 (patch) | |
| tree | d79f7a4544a1e08697995dc18951faebd279e240 /docker/base | |
| parent | 540b0cf6d7da4f7a85c54af847d4f519471d6e27 (diff) | |
| parent | 5e4ade198f794e79ee02a21f77dddd9f1fd2d16e (diff) | |
| download | kolla-6f4e98c67898dea4834abf1cc435848247ee7c44.tar.gz kolla-6f4e98c67898dea4834abf1cc435848247ee7c44.zip | |
Merge "docker: fix 'Empty continuation line found' warnings"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 86c8286dd..48522109d 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -194,13 +194,13 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 ] %} 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_disable | customizable('centos_yum_repos_to_disable') -%} +{%- for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') %} {%- if distro_package_manager == 'dnf' %} && dnf config-manager --disable {{ repo }} \ -{% else %} +{%- else %} && yum-config-manager --disable {{ repo }} \ -{% endif -%} -{% endfor -%} +{%- endif -%} +{%- endfor %} {% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') -%} && rpm --import {{ key }} \ {% endfor -%} |