From 3413c9a7129d956d96292e1adec2d01b2adbeb44 Mon Sep 17 00:00:00 2001 From: zhubingbing Date: Mon, 7 Aug 2017 07:09:05 +0000 Subject: [PATCH] Fix code indentation formate on octavia dockerfile the kolla code indentation format is 4 spaces Change-Id: Iba2694b91e5839bb489488c2a9a971a64a8b3625 --- docker/octavia/octavia-api/Dockerfile.j2 | 2 +- docker/octavia/octavia-base/Dockerfile.j2 | 2 +- docker/octavia/octavia-health-manager/Dockerfile.j2 | 2 +- docker/octavia/octavia-housekeeping/Dockerfile.j2 | 2 +- docker/octavia/octavia-worker/Dockerfile.j2 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/octavia/octavia-api/Dockerfile.j2 b/docker/octavia/octavia-api/Dockerfile.j2 index d389d64b99..d1b9276aaa 100644 --- a/docker/octavia/octavia-api/Dockerfile.j2 +++ b/docker/octavia/octavia-api/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 octavia_api_packages = [ - 'openstack-octavia-api' + 'openstack-octavia-api' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/octavia/octavia-base/Dockerfile.j2 b/docker/octavia/octavia-base/Dockerfile.j2 index ac8045ed83..b167904728 100644 --- a/docker/octavia/octavia-base/Dockerfile.j2 +++ b/docker/octavia/octavia-base/Dockerfile.j2 @@ -10,7 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set octavia_base_packages = [ - 'openstack-octavia-common' + 'openstack-octavia-common' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/octavia/octavia-health-manager/Dockerfile.j2 b/docker/octavia/octavia-health-manager/Dockerfile.j2 index 5cd2ee79d0..295eae1418 100644 --- a/docker/octavia/octavia-health-manager/Dockerfile.j2 +++ b/docker/octavia/octavia-health-manager/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 octavia_health_manager_packages = [ - 'openstack-octavia-health-manager' + 'openstack-octavia-health-manager' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/octavia/octavia-housekeeping/Dockerfile.j2 b/docker/octavia/octavia-housekeeping/Dockerfile.j2 index 0ecaab13ac..ce73bbd202 100644 --- a/docker/octavia/octavia-housekeeping/Dockerfile.j2 +++ b/docker/octavia/octavia-housekeeping/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 octavia_housekeeping_packages = [ - 'openstack-octavia-housekeeping' + 'openstack-octavia-housekeeping' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/octavia/octavia-worker/Dockerfile.j2 b/docker/octavia/octavia-worker/Dockerfile.j2 index 0c0d2392cb..ad137f697f 100644 --- a/docker/octavia/octavia-worker/Dockerfile.j2 +++ b/docker/octavia/octavia-worker/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 octavia_worker_packages = [ - 'openstack-octavia-worker' + 'openstack-octavia-worker' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \