aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2020-04-03 14:12:49 +0200
committerMichal Nasiadka <mnasiadka@gmail.com>2020-05-18 14:15:56 +0200
commit2f00cbe54a772715e55492cc088a5c6ec60a22a6 (patch)
tree32c999a8cb0245828ead94be2e63fbb0046ba3b0 /docker
parent2489c5950a5fafda687922af8079ac6312f8510f (diff)
downloadkolla-2f00cbe54a772715e55492cc088a5c6ec60a22a6.tar.gz
kolla-2f00cbe54a772715e55492cc088a5c6ec60a22a6.zip
octavia: Add ovn-octavia-driver
During this cycle Neutron team merged networking-ovn code to Neutron. As a consequence of it "OVN Octavia provider" project has been created. Before it the driver was placed in networking-ovn tree. Change-Id: I0dcd34b5e2c096557f0485aaec83d344e5cb01bb
Diffstat (limited to 'docker')
-rw-r--r--docker/octavia/octavia-api/Dockerfile.j226
1 files changed, 23 insertions, 3 deletions
diff --git a/docker/octavia/octavia-api/Dockerfile.j2 b/docker/octavia/octavia-api/Dockerfile.j2
index 3420c2eb9..e5b4dcf55 100644
--- a/docker/octavia/octavia-api/Dockerfile.j2
+++ b/docker/octavia/octavia-api/Dockerfile.j2
@@ -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")) }}