openstack/kolla
Code Issues Proposed changes

ODL installed for source images

Browse Source 
ODL is an infrastructure service, in kolla we do not
support source installs for non OpenStack projects.
This change install odl from binaries to all
install_types, installing source code is still supported
from template-overrides

Change-Id: Ie60d35d1df6b7acd62cd529b0208d1c18bd7ee5a
This commit is contained in:
Eduardo Gonzalez 2017-05-19 17:52:55 +02:00
parent e44122c782
commit 7129203bdb
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/* RUN pip --no-cache-dir install /plugins/*
{% endblock %} {% endblock %}
{% block opendaylight_source_install %} {% block opendaylight_install %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set opendaylight_packages = ['java-1.8.0-openjdk'] %} {% set opendaylight_packages = ['java-1.8.0-openjdk'] %}
{% elif base_distro in ['ubuntu', 'debian'] %} {% 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') }} {{ macros.configure_user(name='odl') }}
{% if install_type == 'binary' %} {% block opendaylight_install %}
{% set opendaylight_packages = ['opendaylight'] %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% 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' %} {% set opendaylight_repo = 'opendaylight.repo' %}
{% endif %} {% endif %}
COPY {{ opendaylight_repo }} /etc/yum.repos.d/ COPY {{ opendaylight_repo }} /etc/yum.repos.d/
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% if base_distro in 'debian' %} {% if base_distro in 'debian' %}
{% if odl_release_deb_url is not defined %} {% if odl_release_deb_url is not defined %}
{% set odl_release_deb_url = 'http://download.opensuse.org/repositories/home:/akshitajha/Debian_8.0/' %} {% 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 %} {% 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 # NOTE(egonzalez): ODL fails to install in debian family images with
# existing odl user. First install odl and then allow usage of # existing odl user. First install odl and then allow usage of
# install_packages macro for custom configs. # install_packages macro for custom configs.
{% block debian_opendaylight_install_fix_block %} {% block debian_opendaylight_install_fix_block %}
{{ macros.debian_opendaylight_existing_user_fix() }} {{ macros.debian_opendaylight_existing_user_fix() }}
{% endblock %} {% endblock %}
{% endif %} {% endif %}
{{ macros.install_packages(opendaylight_packages | customizable("packages")) }} {{ 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 %} {% endblock %}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /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", "bifrost-base",
"kafka", "kafka",
"mistral-base", "mistral-base",
"opendaylight",
"ovsdpdk", "ovsdpdk",
] ]
@ -148,7 +147,6 @@ class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
class BuildTestUbuntuSource(BuildTest, base.BaseTestCase): class BuildTestUbuntuSource(BuildTest, base.BaseTestCase):
excluded_images = [ excluded_images = [
"bifrost-base", "bifrost-base",
"opendaylight",
] ]
def setUp(self): def setUp(self):
@ -194,7 +192,6 @@ class BuildTestDebianBinary(BuildTest, base.BaseTestCase):
class BuildTestDebianSource(BuildTest, base.BaseTestCase): class BuildTestDebianSource(BuildTest, base.BaseTestCase):
excluded_images = [ excluded_images = [
"bifrost-base", "bifrost-base",
"opendaylight",
"sensu-base", "sensu-base",
] ]
@ -234,7 +231,6 @@ class BuildTestOracleLinuxSource(BuildTest, base.BaseTestCase):
excluded_images = [ excluded_images = [
"bifrost-base", "bifrost-base",
"kafka", "kafka",
"opendaylight",
"ovsdpdk", "ovsdpdk",
] ]