Merge "build: enable Octavia for Ubuntu/binary"
This commit is contained in:
commit
52024d2c57
|
@ -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 %}
|
||||
|
||||
|
||||
|
|
|
@ -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")) }}
|
||||
|
|
|
@ -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")) }}
|
||||
|
|
|
@ -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")) }}
|
||||
|
|
|
@ -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")) }}
|
||||
|
|
|
@ -178,7 +178,6 @@ UNBUILDABLE_IMAGES = {
|
|||
"ironic-neutron-agent",
|
||||
"mistral-event-engine",
|
||||
"novajoin-base",
|
||||
"octavia-base",
|
||||
"tacker-base",
|
||||
"tripleoclient",
|
||||
"vitrage-base",
|
||||
|
|
Loading…
Reference in New Issue