3 files changed, 23 insertions, 8 deletions
diff --git a/docker/kuryr/Dockerfile.j2 b/docker/kuryr/kuryr-base/Dockerfile.j2
index 21c07e370..42d33bd5d 100644
--- a/docker/kuryr/Dockerfile.j2
+++ b/docker/kuryr/kuryr-base/Dockerfile.j2
@@ -1,8 +1,6 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
-{% block kuryr_header %}{% endblock %}
-
 {% if install_type == 'binary' %}
 
 RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
@@ -10,14 +8,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% elif install_type == 'source' %}
 
-ADD kuryr-archive /kuryr-source
-RUN ln -s kuryr-source/* kuryr \
-    && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /kuryr
+ADD kuryr-base-archive /kuryr-base-source
+RUN ln -s kuryr-base-source/* kuryr-base \
+    && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /kuryr-base
 
 {% endif %}
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
-{% block kuryr_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-{{ include_footer }}
+{% block kuryr_base_footer %}{% endblock %}
diff --git a/docker/kuryr/extend_start.sh b/docker/kuryr/kuryr-base/extend_start.sh
index ee7045d04..ee7045d04 100644
--- a/docker/kuryr/extend_start.sh
+++ b/docker/kuryr/kuryr-base/extend_start.sh
diff --git a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2
new file mode 100644
index 000000000..9f5f615d2
--- /dev/null
+++ b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2
@@ -0,0 +1,19 @@
+FROM {{ namespace }}/{{ image_prefix }}kuryr-base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+{% if install_type == 'binary' %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
+
+{% elif install_type == 'source' %}
+
+ADD kuryr-libnetwork-archive /kuryr-libnetwork-source
+RUN ln -s kuryr-libnetwork-source/* kuryr-libnetwork \
+    && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /kuryr-libnetwork
+
+{% endif %}
+
+{% block kuryr_libnetwork_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+{{ include_footer }}