openstack/kolla-ansible
Code Issues Proposed changes

Add kuryr-libnetwork Dockerfile

Browse Source 
Kuryr repo has been split to kuryr and kuryr-libnetwork

Change-Id: I6d05adf1de89611e2cb0f8469ed42ca1401ace56
Co-authored-by: Mohammad Banikazemi <mb@us.ibm.com>
Partially-implements: bp kuryr-docker-plugin
This commit is contained in:
Hui Kang 2016-09-14 18:56:00 +00:00
parent 37ec5ecb52
commit 4fabd37e31
5 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/kuryr/Dockerfile.j2 → docker/kuryr/kuryr-base/Dockerfile.j2
View File

@ -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 %}

0
docker/kuryr/extend_start.sh → docker/kuryr/kuryr-base/extend_start.sh
View File

19
docker/kuryr/kuryr-libnetwork/Dockerfile.j2 Normal file
View File

@ -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 }}

6
kolla/common/config.py
View File

@ -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/'

6
tests/test_build.py
View File

@ -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",