openstack
/
kolla
Code Issues Proposed changes

Merge "octavia: Add ovn-octavia-driver"

This commit is contained in:
Zuul 2020-05-18 17:41:33 +00:00 committed by Gerrit Code Review
parent 8257a40880 2f00cbe54a
commit 55eab6edc4
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,14 +13,26 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'httpd',
'mod_ssl',
'openstack-octavia-api',
'python3-mod_wsgi'
'python3-mod_wsgi',
'python3-ovn-octavia-provider'
] %}
{% elif base_package_type == 'deb' %}
{% set octavia_api_packages = [
'octavia-api',
'apache2',
'libapache2-mod-wsgi-py3'
'libapache2-mod-wsgi-py3',
'octavia-api',
] %}
{% if base_distro == 'debian' %}
{% set octavia_api_packages = octavia_api_packages + [
'python3-networking-ovn'
] %}
{% elif base_distro == 'ubuntu' %}
{% set octavia_api_packages = octavia_api_packages + [
'python3-ovn-octavia-provider'
] %}
{% endif %}
{% endif %}
{% elif install_type == 'source' %}
@ -38,6 +50,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
{% endif %}
{% set octavia_api_plugins_pip_packages = [
'/plugins/*'
] %}
ADD plugins-archive /
RUN if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(octavia_api_plugins_pip_packages) }} ; \
fi
{% endif %}
{{ macros.install_packages(octavia_api_packages | customizable("packages")) }}

4
kolla/common/config.py
View File

@ -644,6 +644,10 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/octavia/'
'octavia-6.0.0.tar.gz')},
'octavia-api-plugin-ovn-octavia-provider': {
'type': 'url',
'location': ('$tarballs_base/ovn-octavia-provider/'
'ovn-octavia-provider-${openstack_branch}.tar.gz')},
'panko-base': {
'type': 'url',
'location': ('$tarballs_base/panko/'