diff options
| -rw-r--r-- | contrib/template-override/opendaylight-template-overrides.j2 | 2 | ||||
| -rw-r--r-- | docker/opendaylight/Dockerfile.j2 | 37 | ||||
| -rw-r--r-- | tests/test_build.py | 4 |
3 files changed, 18 insertions, 25 deletions
diff --git a/contrib/template-override/opendaylight-template-overrides.j2 b/contrib/template-override/opendaylight-template-overrides.j2 index 3e2e70085..b4c864b9d 100644 --- a/contrib/template-override/opendaylight-template-overrides.j2 +++ b/contrib/template-override/opendaylight-template-overrides.j2 @@ -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'] %} diff --git a/docker/opendaylight/Dockerfile.j2 b/docker/opendaylight/Dockerfile.j2 index 7551c3ce7..1b5f76a35 100644 --- a/docker/opendaylight/Dockerfile.j2 +++ b/docker/opendaylight/Dockerfile.j2 @@ -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 diff --git a/tests/test_build.py b/tests/test_build.py index 881052f32..05d8f1dc9 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -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", ] |