openstack
/
kolla
Code Issues Proposed changes

Merge "ODL installed for source images"

This commit is contained in:
Jenkins 2017-08-01 10:14:35 +00:00 committed by Gerrit Code Review
parent c89ed08429 7129203bdb
commit 6e2130fdad
3 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/template-override/opendaylight-template-overrides.j2
View File

@ -5,7 +5,7 @@ ADD plugins-archive /
RUN pip --no-cache-dir install /plugins/*
{% endblock %}
{% block opendaylight_source_install %}
{% block opendaylight_install %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set opendaylight_packages = ['java-1.8.0-openjdk'] %}
{% elif base_distro in ['ubuntu', 'debian'] %}

37
docker/opendaylight/Dockerfile.j2
View File

@ -7,39 +7,36 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='odl') }}
{% if install_type == 'binary' %}
{% set opendaylight_packages = ['opendaylight'] %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% block opendaylight_install %}
{% if opendaylight_repo is not defined %}
{% set opendaylight_packages = ['opendaylight'] %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if opendaylight_repo is not defined %}
{% set opendaylight_repo = 'opendaylight.repo' %}
{% endif %}
{% endif %}
COPY {{ opendaylight_repo }} /etc/yum.repos.d/
{% elif base_distro in ['debian', 'ubuntu'] %}
{% if base_distro in 'debian' %}
{% if odl_release_deb_url is not defined %}
{% set odl_release_deb_url = 'http://download.opensuse.org/repositories/home:/akshitajha/Debian_8.0/' %}
{% endif %}
RUN sh -c "echo 'deb {{ odl_release_deb_url }} /' > /etc/apt/sources.list.d/opendaylight.list"
{% elif base_distro in ['debian', 'ubuntu'] %}
{% if base_distro in 'debian' %}
{% if odl_release_deb_url is not defined %}
{% set odl_release_deb_url = 'http://download.opensuse.org/repositories/home:/akshitajha/Debian_8.0/' %}
{% endif %}
RUN sh -c "echo 'deb {{ odl_release_deb_url }} /' > /etc/apt/sources.list.d/opendaylight.list"
{% endif %}
# NOTE(egonzalez): ODL fails to install in debian family images with
# existing odl user. First install odl and then allow usage of
# install_packages macro for custom configs.
{% block debian_opendaylight_install_fix_block %}
{{ macros.debian_opendaylight_existing_user_fix() }}
{% endblock %}
{% endif %}
{% block debian_opendaylight_install_fix_block %}
{{ macros.debian_opendaylight_existing_user_fix() }}
{% endblock %}
{% endif %}
{{ macros.install_packages(opendaylight_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% block opendaylight_source_install %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endblock %}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start

4
tests/test_build.py
View File

@ -102,7 +102,6 @@ class BuildTestCentosSource(BuildTest, base.BaseTestCase):
"bifrost-base",
"kafka",
"mistral-base",
"opendaylight",
"ovsdpdk",
]
@ -147,7 +146,6 @@ class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
class BuildTestUbuntuSource(BuildTest, base.BaseTestCase):
excluded_images = [
"bifrost-base",
"opendaylight",
]
def setUp(self):
@ -192,7 +190,6 @@ class BuildTestDebianBinary(BuildTest, base.BaseTestCase):
class BuildTestDebianSource(BuildTest, base.BaseTestCase):
excluded_images = [
"bifrost-base",
"opendaylight",
"sensu-base",
]
@ -232,7 +229,6 @@ class BuildTestOracleLinuxSource(BuildTest, base.BaseTestCase):
excluded_images = [
"bifrost-base",
"kafka",
"opendaylight",
"ovsdpdk",
]