openstack
/
kolla
Code Issues Proposed changes

Merge "build: enable Octavia for Ubuntu/binary"

This commit is contained in:
Zuul 2019-09-18 18:11:31 +00:00 committed by Gerrit Code Review
parent 827dcbc7df 9ce3847230
commit 52024d2c57
6 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/octavia/octavia-api/Dockerfile.j2
View File

@ -22,8 +22,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %} ] %}
{% endif %} {% endif %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% set octavia_api_packages = [
&& /bin/false 'octavia-api',
'apache2',
'libapache2-mod-wsgi-py3'
] %}
{% endif %} {% endif %}

5
docker/octavia/octavia-base/Dockerfile.j2
View File

@ -13,8 +13,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openstack-octavia-common' 'openstack-octavia-common'
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% set octavia_base_packages = [
&& /bin/false 'octavia-common'
] %}
{% endif %} {% endif %}
{{ macros.install_packages(octavia_base_packages | customizable("packages")) }} {{ macros.install_packages(octavia_base_packages | customizable("packages")) }}

5
docker/octavia/octavia-health-manager/Dockerfile.j2
View File

@ -11,8 +11,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openstack-octavia-health-manager' 'openstack-octavia-health-manager'
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% set octavia_health_manager_packages = [
&& /bin/false 'octavia-health-manager'
] %}
{% endif %} {% endif %}
{{ macros.install_packages(octavia_health_manager_packages | customizable("packages")) }} {{ macros.install_packages(octavia_health_manager_packages | customizable("packages")) }}

5
docker/octavia/octavia-housekeeping/Dockerfile.j2
View File

@ -11,8 +11,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openstack-octavia-housekeeping' 'openstack-octavia-housekeeping'
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% set octavia_housekeeping_packages = [
&& /bin/false 'octavia-housekeeping'
] %}
{% endif %} {% endif %}
{{ macros.install_packages(octavia_housekeeping_packages | customizable("packages")) }} {{ macros.install_packages(octavia_housekeeping_packages | customizable("packages")) }}

5
docker/octavia/octavia-worker/Dockerfile.j2
View File

@ -11,8 +11,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openstack-octavia-worker' 'openstack-octavia-worker'
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% set octavia_worker_packages = [
&& /bin/false 'octavia-worker'
] %}
{% endif %} {% endif %}
{{ macros.install_packages(octavia_worker_packages | customizable("packages")) }} {{ macros.install_packages(octavia_worker_packages | customizable("packages")) }}

1
kolla/image/build.py
View File

@ -178,7 +178,6 @@ UNBUILDABLE_IMAGES = {
"ironic-neutron-agent", "ironic-neutron-agent",
"mistral-event-engine", "mistral-event-engine",
"novajoin-base", "novajoin-base",
"octavia-base",
"tacker-base", "tacker-base",
"tripleoclient", "tripleoclient",
"vitrage-base", "vitrage-base",