diff options
| author | Michał Nasiadka <mnasiadka@gmail.com> | 2021-01-18 13:08:54 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2021-01-27 10:33:36 +0000 |
| commit | 785fe5641de3e46b17e52d16e0c8a9e02b8a5633 (patch) | |
| tree | da9fdb2782af66fd6149609f69ffd4c235b23fc7 | |
| parent | 62da72f5dbf93071b8997ccd5a93f4f0788721e0 (diff) | |
| download | kolla-785fe5641de3e46b17e52d16e0c8a9e02b8a5633.tar.gz kolla-785fe5641de3e46b17e52d16e0c8a9e02b8a5633.zip | |
Add octavia-driver-agent
Change-Id: Iea2c02d59d2906141ca37ce9b48a0f7f4fc14421
| -rw-r--r-- | docker/octavia/octavia-driver-agent/Dockerfile.j2 | 41 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rw-r--r-- | releasenotes/notes/octavia-driver-agent-83ee17b82c577e95.yaml | 5 |
3 files changed, 50 insertions, 0 deletions
diff --git a/docker/octavia/octavia-driver-agent/Dockerfile.j2 b/docker/octavia/octavia-driver-agent/Dockerfile.j2 new file mode 100644 index 000000000..68365cabd --- /dev/null +++ b/docker/octavia/octavia-driver-agent/Dockerfile.j2 @@ -0,0 +1,41 @@ +FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }} +{% block labels %} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} + +{% block octavia_driver_agent_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} + {% if base_package_type == 'rpm' %} + {% set octavia_driver_agent_packages = [ + 'python3-ovn-octavia-provider' + ] %} + {% elif base_package_type == 'deb' %} + {% set octavia_driver_agent_packages = [ + 'octavia-driver-agent', + 'python3-ovn-octavia-provider' + ] %} + {% endif %} + +{% elif install_type == 'source' %} + {% set octavia_driver_agent_packages = [ + ] %} + + {% set octavia_driver_agent_plugins_pip_packages = [ + '/plugins/*' + ] %} + +{{ macros.install_packages(octavia_driver_agent_packages | customizable("packages")) }} + +ADD plugins-archive / +RUN if [ "$(ls /plugins)" ]; then \ + {{ macros.install_pip(octavia_driver_agent_plugins_pip_packages) }} ; \ + fi +{% endif %} + +{% block octavia_driver_agent_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER octavia diff --git a/kolla/common/config.py b/kolla/common/config.py index f0ff3b4e5..4cf8143ed 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -584,6 +584,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/ovn-octavia-provider/' 'ovn-octavia-provider-${openstack_branch}.tar.gz')}, + 'octavia-driver-agent-plugin-ovn-octavia-provider': { + 'type': 'url', + 'location': ('$tarballs_base/openstack/ovn-octavia-provider/' + 'ovn-octavia-provider-${openstack_branch}.tar.gz')}, 'panko-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/panko/' diff --git a/releasenotes/notes/octavia-driver-agent-83ee17b82c577e95.yaml b/releasenotes/notes/octavia-driver-agent-83ee17b82c577e95.yaml new file mode 100644 index 000000000..3e89cf38a --- /dev/null +++ b/releasenotes/notes/octavia-driver-agent-83ee17b82c577e95.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + ``octavia-driver-agent`` image was added to support other Octavia providers than + ``amphora``. |