diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-05 21:08:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-05 21:08:00 +0000 |
| commit | 0d1983ca96531e09efd07b18f3171b4ae0a690a5 (patch) | |
| tree | ccabc43133f68f3179531aafbf0db2d258a1df7c /docker/openvswitch | |
| parent | 5b01ab5c0e87f1176e4b305bfdc83b5b374c3515 (diff) | |
| parent | 4f5bac108952a4f7e0bec3789bea175c5875d6f7 (diff) | |
| download | kolla-0d1983ca96531e09efd07b18f3171b4ae0a690a5.tar.gz kolla-0d1983ca96531e09efd07b18f3171b4ae0a690a5.zip | |
Merge "introduces support for the OVS DPDK dataplane"
Diffstat (limited to 'docker/openvswitch')
| -rw-r--r-- | docker/openvswitch/openvswitch-base/Dockerfile.j2 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index 75c60d890..1d16e8872 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -5,6 +5,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{% block ovs_install %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set openvswitch_base_packages = ['openvswitch'] %} @@ -14,6 +16,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} {{ macros.install_packages(openvswitch_base_packages | customizable("packages")) }} +{% endblock %} + COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_openvswitch_extend_start \ |