diff options
| author | Zuul <zuul@review.opendev.org> | 2020-05-18 17:41:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-05-18 17:41:33 +0000 |
| commit | 55eab6edc43ddb24a918298aafefdff322afb61b (patch) | |
| tree | 807908d5b50deb0fd8505c7329640589f656a24c | |
| parent | 8257a4088025ac4273c89cfa8d6021f7e556e80a (diff) | |
| parent | 2f00cbe54a772715e55492cc088a5c6ec60a22a6 (diff) | |
| download | kolla-55eab6edc43ddb24a918298aafefdff322afb61b.tar.gz kolla-55eab6edc43ddb24a918298aafefdff322afb61b.zip | |
Merge "octavia: Add ovn-octavia-driver"
| -rw-r--r-- | docker/octavia/octavia-api/Dockerfile.j2 | 26 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 |
2 files changed, 27 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")) }} diff --git a/kolla/common/config.py b/kolla/common/config.py index 6929f8837..70fc42baf 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -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/' |