From 4fabd37e319cbc138d71f8411925d661acc3e71e Mon Sep 17 00:00:00 2001 From: Hui Kang Date: Wed, 14 Sep 2016 18:56:00 +0000 Subject: Add kuryr-libnetwork Dockerfile Kuryr repo has been split to kuryr and kuryr-libnetwork Change-Id: I6d05adf1de89611e2cb0f8469ed42ca1401ace56 Co-authored-by: Mohammad Banikazemi Partially-implements: bp kuryr-docker-plugin --- docker/kuryr/Dockerfile.j2 | 23 ----------------------- docker/kuryr/extend_start.sh | 6 ------ docker/kuryr/kuryr-base/Dockerfile.j2 | 19 +++++++++++++++++++ docker/kuryr/kuryr-base/extend_start.sh | 6 ++++++ docker/kuryr/kuryr-libnetwork/Dockerfile.j2 | 19 +++++++++++++++++++ kolla/common/config.py | 6 +++++- tests/test_build.py | 6 +++--- 7 files changed, 52 insertions(+), 33 deletions(-) delete mode 100644 docker/kuryr/Dockerfile.j2 delete mode 100644 docker/kuryr/extend_start.sh create mode 100644 docker/kuryr/kuryr-base/Dockerfile.j2 create mode 100644 docker/kuryr/kuryr-base/extend_start.sh create mode 100644 docker/kuryr/kuryr-libnetwork/Dockerfile.j2 diff --git a/docker/kuryr/Dockerfile.j2 b/docker/kuryr/Dockerfile.j2 deleted file mode 100644 index 21c07e370..000000000 --- a/docker/kuryr/Dockerfile.j2 +++ /dev/null @@ -1,23 +0,0 @@ -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 }}' \ - && /bin/false - -{% 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 - -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -{% block kuryr_footer %}{% endblock %} -{% block footer %}{% endblock %} -{{ include_footer }} diff --git a/docker/kuryr/extend_start.sh b/docker/kuryr/extend_start.sh deleted file mode 100644 index ee7045d04..000000000 --- a/docker/kuryr/extend_start.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - mkdir -p /usr/lib/docker/plugins/kuryr - exit 0 -fi diff --git a/docker/kuryr/kuryr-base/Dockerfile.j2 b/docker/kuryr/kuryr-base/Dockerfile.j2 new file mode 100644 index 000000000..42d33bd5d --- /dev/null +++ b/docker/kuryr/kuryr-base/Dockerfile.j2 @@ -0,0 +1,19 @@ +FROM {{ namespace }}/{{ image_prefix }}openstack-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-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_base_footer %}{% endblock %} diff --git a/docker/kuryr/kuryr-base/extend_start.sh b/docker/kuryr/kuryr-base/extend_start.sh new file mode 100644 index 000000000..ee7045d04 --- /dev/null +++ b/docker/kuryr/kuryr-base/extend_start.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then + mkdir -p /usr/lib/docker/plugins/kuryr + exit 0 +fi 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 }} diff --git a/kolla/common/config.py b/kolla/common/config.py index 64b9a771a..c6c90e1dd 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -213,10 +213,14 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/keystone/' 'keystone-master.tar.gz')}, - 'kuryr': { + 'kuryr-base': { 'type': 'url', 'location': ('http://tarballs.openstack.org/kuryr/' 'kuryr-master.tar.gz')}, + 'kuryr-libnetwork': { + 'type': 'url', + 'location': ('http://tarballs.openstack.org/kuryr-libnetwork/' + 'kuryr-libnetwork-master.tar.gz')}, 'magnum-base': { 'type': 'url', 'location': ('http://tarballs.openstack.org/magnum/' diff --git a/tests/test_build.py b/tests/test_build.py index 96e67e794..0db8901c9 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -65,7 +65,7 @@ class BuildTest(object): class BuildTestCentosBinary(BuildTest, base.BaseTestCase): - excluded_images = ["kuryr", + excluded_images = ["kuryr-base", "neutron-sfc-agent", "senlin-base", "vmtp", @@ -93,7 +93,7 @@ class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase): # TODO(Jeffrey4l): UCA latest Newton release lack of neutron-lbaas-common # package, just add neutron-lbaas-agent into the exclude_image. Once they # fix it, this should be reverted. - excluded_images = ["kuryr", + excluded_images = ["kuryr-base", "neutron-sfc-agent", "neutron-lbaas-agent", "senlin-base", @@ -120,7 +120,7 @@ class BuildTestUbuntuSource(BuildTest, base.BaseTestCase): class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase): - excluded_images = ["kuryr", + excluded_images = ["kuryr-base", "neutron-sfc-agent", "senlin-base", "vmtp", -- cgit v1.2.3