diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-08-11 10:33:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-08-11 10:33:22 +0000 |
| commit | a0b22b4d4535399d96fb706899816560f710e18c (patch) | |
| tree | 9bee89679303a93817b9b093a05d691c0bfe9966 | |
| parent | 80e6686d1c1e2813d73bd91b3cd77074a5c95588 (diff) | |
| parent | 3413c9a7129d956d96292e1adec2d01b2adbeb44 (diff) | |
| download | kolla-a0b22b4d4535399d96fb706899816560f710e18c.tar.gz kolla-a0b22b4d4535399d96fb706899816560f710e18c.zip | |
Merge "Fix code indentation formate on octavia dockerfile"
| -rw-r--r-- | docker/octavia/octavia-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/octavia/octavia-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/octavia/octavia-health-manager/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/octavia/octavia-housekeeping/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | 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 d389d64b9..d1b9276aa 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 ac8045ed8..b16790472 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 5cd2ee79d..295eae141 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 0ecaab13a..ce73bbd20 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 0c0d2392c..ad137f697 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 }}' \ |