diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-09-17 17:08:47 +0200 |
|---|---|---|
| committer | Dincer Celik <hello@dincercelik.com> | 2019-10-07 21:00:41 +0300 |
| commit | 7d0450d8070ab9aed0becb6f9e6c7c6befefaf6f (patch) | |
| tree | 4aa3790ad43619cf6ae4f3fbda5de93f0ec44c9c /docker | |
| parent | e6d7c8181475a6613192e02d3f4c6cf48bf5c2de (diff) | |
| download | kolla-7d0450d8070ab9aed0becb6f9e6c7c6befefaf6f.tar.gz kolla-7d0450d8070ab9aed0becb6f9e6c7c6befefaf6f.zip | |
build: enable Octavia for Ubuntu/binary
Change-Id: Icc68b404d8713a9fcf0026374378d1645fe30d52
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/octavia/octavia-api/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | docker/octavia/octavia-base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/octavia/octavia-health-manager/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/octavia/octavia-housekeeping/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/octavia/octavia-worker/Dockerfile.j2 | 5 |
5 files changed, 17 insertions, 10 deletions
diff --git a/docker/octavia/octavia-api/Dockerfile.j2 b/docker/octavia/octavia-api/Dockerfile.j2 index cebdd2e54..8fa03cd91 100644 --- a/docker/octavia/octavia-api/Dockerfile.j2 +++ b/docker/octavia/octavia-api/Dockerfile.j2 @@ -22,8 +22,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% endif %} {% elif base_package_type == 'deb' %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + {% set octavia_api_packages = [ + 'octavia-api', + 'apache2', + 'libapache2-mod-wsgi-py3' + ] %} {% endif %} diff --git a/docker/octavia/octavia-base/Dockerfile.j2 b/docker/octavia/octavia-base/Dockerfile.j2 index 0efcc6db7..526965f51 100644 --- a/docker/octavia/octavia-base/Dockerfile.j2 +++ b/docker/octavia/octavia-base/Dockerfile.j2 @@ -13,8 +13,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openstack-octavia-common' ] %} {% elif base_package_type == 'deb' %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + {% set octavia_base_packages = [ + 'octavia-common' + ] %} {% endif %} {{ macros.install_packages(octavia_base_packages | customizable("packages")) }} diff --git a/docker/octavia/octavia-health-manager/Dockerfile.j2 b/docker/octavia/octavia-health-manager/Dockerfile.j2 index 4dfcbe189..6983f793c 100644 --- a/docker/octavia/octavia-health-manager/Dockerfile.j2 +++ b/docker/octavia/octavia-health-manager/Dockerfile.j2 @@ -11,8 +11,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openstack-octavia-health-manager' ] %} {% elif base_package_type == 'deb' %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + {% set octavia_health_manager_packages = [ + 'octavia-health-manager' + ] %} {% endif %} {{ macros.install_packages(octavia_health_manager_packages | customizable("packages")) }} diff --git a/docker/octavia/octavia-housekeeping/Dockerfile.j2 b/docker/octavia/octavia-housekeeping/Dockerfile.j2 index c7a25cf7a..31688d6fe 100644 --- a/docker/octavia/octavia-housekeeping/Dockerfile.j2 +++ b/docker/octavia/octavia-housekeeping/Dockerfile.j2 @@ -11,8 +11,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openstack-octavia-housekeeping' ] %} {% elif base_package_type == 'deb' %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + {% set octavia_housekeeping_packages = [ + 'octavia-housekeeping' + ] %} {% endif %} {{ macros.install_packages(octavia_housekeeping_packages | customizable("packages")) }} diff --git a/docker/octavia/octavia-worker/Dockerfile.j2 b/docker/octavia/octavia-worker/Dockerfile.j2 index 296852495..40db1bc80 100644 --- a/docker/octavia/octavia-worker/Dockerfile.j2 +++ b/docker/octavia/octavia-worker/Dockerfile.j2 @@ -11,8 +11,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openstack-octavia-worker' ] %} {% elif base_package_type == 'deb' %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + {% set octavia_worker_packages = [ + 'octavia-worker' + ] %} {% endif %} {{ macros.install_packages(octavia_worker_packages | customizable("packages")) }} |
