diff options
| author | Jon Schlueter <jschluet@redhat.com> | 2019-03-21 13:00:42 -0400 |
|---|---|---|
| committer | Jon Schlueter <jschluet@redhat.com> | 2019-03-21 13:01:39 -0400 |
| commit | 91c5453cc21491df42cc738583b646ca7afec08e (patch) | |
| tree | a049879a50ac87a3d9f5e9c85ce5c2c353f3b00c /docker/base | |
| parent | cd307fb1ab261e5a24d3290a523dd573cb3d7e4c (diff) | |
| download | kolla-91c5453cc21491df42cc738583b646ca7afec08e.tar.gz kolla-91c5453cc21491df42cc738583b646ca7afec08e.zip | |
Fixup whitespace issue in chaining
base_rhel_package_installation block had whitespace isses
depending on which branch of the if statement you had.
this resulted in a blank line in the continued "\ \n &&" rendered Dockerfile
Change-Id: I634f1bc01806e2606d611b3697e84b43278c4a9b
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 184ef6824..cf1f8e437 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -168,11 +168,11 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 RUN yum-config-manager --enable rhel-7-server-optional-rpms \ && yum -y install \ yum-plugin-priorities \ - {% if install_type != 'binary' or install_metatype != 'rdo' %} + {%- if install_type != 'binary' or install_metatype != 'rdo' %} && yum -y install \ https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \ - {% endif %} + {% endif -%} && yum-config-manager --enable rhel-7-server-extras-rpms \ && yum-config-manager --enable rhel-7-server-rhceph-2-osd-rpms \ && yum-config-manager --enable rhel-7-server-rhceph-2-mon-rpms \ |