diff options
| author | Jon Schlueter <jschluet@redhat.com> | 2018-07-26 14:50:39 -0400 |
|---|---|---|
| committer | Jon Schlueter <jschluet@redhat.com> | 2018-07-26 14:51:41 -0400 |
| commit | 2b023ba13ef0f11757fef029a4a6ed5a2468700e (patch) | |
| tree | d59d9c5f94c413c067b7c06718cf326f1da19fb7 /docker | |
| parent | 778f6dc8235d251d851044b3c54c3d7aded750f5 (diff) | |
| download | kolla-2b023ba13ef0f11757fef029a4a6ed5a2468700e.tar.gz kolla-2b023ba13ef0f11757fef029a4a6ed5a2468700e.zip | |
validate-indentation: expand check to also catch macros.install_packages
Fixed up 5 Dockerfile.j2 files that had the issue
Change-Id: I8a5551050a75d64712c36d53573437a18777a82f
Diffstat (limited to 'docker')
5 files changed, 6 insertions, 6 deletions
diff --git a/docker/mistral/mistral-event-engine/Dockerfile.j2 b/docker/mistral/mistral-event-engine/Dockerfile.j2 index aa51729a7..987c6cb93 100644 --- a/docker/mistral/mistral-event-engine/Dockerfile.j2 +++ b/docker/mistral/mistral-event-engine/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set mistral_event_engine_packages = ['openstack-mistral-event-engine'] %} - {{ macros.install_packages(mistral_event_engine_packages | customizable("packages")) }} +{{ macros.install_packages(mistral_event_engine_packages | customizable("packages")) }} {% elif base_distro in ['debian', 'ubuntu'] %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ && /bin/false diff --git a/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 b/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 index e8567aecb..169132074 100644 --- a/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 +++ b/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 @@ -21,7 +21,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} - {{ macros.install_packages(ironic_neutron_agent_packages | customizable("packages")) }} +{{ macros.install_packages(ironic_neutron_agent_packages | customizable("packages")) }} {% endif %} diff --git a/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2 index d84a2a6dc..7c552ec9f 100644 --- a/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2 +++ b/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2 @@ -17,7 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% endif %} - {{ macros.install_packages(neutron_metadata_agent_ovn_packages | customizable("packages")) }} +{{ macros.install_packages(neutron_metadata_agent_ovn_packages | customizable("packages")) }} {% elif install_type == 'source' %} diff --git a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 index ed0d32d54..c4b188661 100644 --- a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 +++ b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 @@ -25,7 +25,7 @@ RUN curl -ssL -o /opt/cadvisor https://github.com/google/cadvisor/releases/downl 'http://snapshot.debian.org/archive/debian/20180503T060640Z/pool/main/c/cadvisor/cadvisor_0.27.1+dfsg2-1_arm64.deb' ] %} - {{ macros.install_packages(cadvisor_packages | customizable("packages")) }} +{{ macros.install_packages(cadvisor_packages | customizable("packages")) }} RUN ln -s /usr/bin/cadvisor /opt/cadvisor {% endif %} diff --git a/docker/tripleo-ui/Dockerfile.j2 b/docker/tripleo-ui/Dockerfile.j2 index 0c4bac8d8..37f4eeda1 100644 --- a/docker/tripleo-ui/Dockerfile.j2 +++ b/docker/tripleo-ui/Dockerfile.j2 @@ -15,7 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} - {{ macros.install_packages(tripleo_ui_packages | customizable("packages")) }} +{{ macros.install_packages(tripleo_ui_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf @@ -34,7 +34,7 @@ RUN echo 'tripleo-ui not yet available for {{ base_distro }}' && /bin/false ] %} - {{ macros.install_packages(tripleo_ui_packages | customizable("packages")) }} +{{ macros.install_packages(tripleo_ui_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf |