aboutsummaryrefslogtreecommitdiff
path: root/docker/openvswitch
diff options
context:
space:
mode:
Diffstat (limited to 'docker/openvswitch')
-rw-r--r--docker/openvswitch/openvswitch-base/Dockerfile.j24
-rw-r--r--docker/openvswitch/openvswitch-db-server/Dockerfile.j24
-rw-r--r--docker/openvswitch/openvswitch-vswitchd/Dockerfile.j24
3 files changed, 11 insertions, 1 deletions
diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2
index 52ee47a44..7f79cb818 100644
--- a/docker/openvswitch/openvswitch-base/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2
@@ -26,8 +26,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python3-netifaces',
'tcpdump'
] %}
-
{% endif %}
+
{{ macros.install_packages(openvswitch_base_packages | customizable("packages")) }}
{% endblock %}
@@ -41,4 +41,6 @@ RUN if [ -e /usr/sbin/tcpdump ]; then mv /usr/sbin/tcpdump /usr/bin/tcpdump; fi
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_openvswitch_extend_start \
&& chmod 755 /usr/local/bin/ovs_wrapper
+{{ macros.kolla_patch_sources() }}
+
{% block openvswitch_base_footer %}{% endblock %}
diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
index f04cd71ec..59d701dfb 100644
--- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
@@ -5,8 +5,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block openvswitch_db_server_header %}{% endblock %}
+{% import "macros.j2" as macros with context %}
+
COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start
RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start
+{{ macros.kolla_patch_sources() }}
+
{% block openvswitch_db_server_footer %}{% endblock %}
{% block footer %}{% endblock %}
diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
index 1e1b8d054..a0f761a83 100644
--- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
@@ -5,8 +5,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block openvswitch_vswitchd_header %}{% endblock %}
+{% import "macros.j2" as macros with context %}
+
COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start
RUN chmod 644 /usr/local/bin/kolla_openvswitch_extend_start
+{{ macros.kolla_patch_sources() }}
+
{% block openvswitch_vswitchd_footer %}{% endblock %}
{% block footer %}{% endblock %}