diff options
| author | Hui Kang <kangh@us.ibm.com> | 2016-03-27 03:55:15 +0000 |
|---|---|---|
| committer | Hui Kang <kangh@us.ibm.com> | 2016-06-21 22:54:44 -0400 |
| commit | 480c479ebf9520b4e8402cc23a20e0a0db707761 (patch) | |
| tree | 7c650dd4efcb0070076641e352e4cb9b63eae842 | |
| parent | bb2ac5f6f97116baf6836fbc74bf16d1205a37e6 (diff) | |
| download | kolla-480c479ebf9520b4e8402cc23a20e0a0db707761.tar.gz kolla-480c479ebf9520b4e8402cc23a20e0a0db707761.zip | |
Add Kuryr Docker container
Co-authored-by: Mohammad Banikazemi <mb@us.ibm.com>
Partially-implements: bp kuryr-docker-plugin
Change-Id: Ife54f71984ff6c9825769e81fd39e3444c6fe310
| -rw-r--r-- | docker/kuryr/Dockerfile.j2 | 19 | ||||
| -rw-r--r-- | docker/kuryr/extend_start.sh | 6 | ||||
| -rw-r--r-- | kolla/common/config.py | 5 | ||||
| -rw-r--r-- | tests/test_build.py | 4 |
4 files changed, 31 insertions, 3 deletions
diff --git a/docker/kuryr/Dockerfile.j2 b/docker/kuryr/Dockerfile.j2 new file mode 100644 index 000000000..d0e094771 --- /dev/null +++ b/docker/kuryr/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-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 + +{{ include_footer }} diff --git a/docker/kuryr/extend_start.sh b/docker/kuryr/extend_start.sh new file mode 100644 index 000000000..ee7045d04 --- /dev/null +++ b/docker/kuryr/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/kolla/common/config.py b/kolla/common/config.py index b1f2fdea1..ee10bcce0 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -204,6 +204,10 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/keystone/' 'keystone-master.tar.gz')}, + 'kuryr': { + 'type': 'url', + 'location': ('http://tarballs.openstack.org/kuryr/' + 'kuryr-master.tar.gz')}, 'magnum-base': { 'type': 'url', 'location': ('http://tarballs.openstack.org/magnum/' @@ -264,7 +268,6 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/zaqar/' 'zaqar-master.tar.gz')} - } diff --git a/tests/test_build.py b/tests/test_build.py index 373fdcbfb..e5832aaac 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -67,7 +67,7 @@ class BuildTest(object): class BuildTestCentosBinary(BuildTest, base.BaseTestCase): - excluded_images = [] + excluded_images = ["kuryr"] def setUp(self): super(BuildTestCentosBinary, self).setUp() @@ -104,7 +104,7 @@ class BuildTestUbuntuSource(BuildTest, base.BaseTestCase): class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase): - excluded_images = [] + excluded_images = ["kuryr"] def setUp(self): super(BuildTestOracleLinuxBinary, self).setUp() |