openstack/kolla
Code Issues Proposed changes

Updates opendaylight repo for Carbon release

Browse Source 
Carbon was released for ODL so we should update to that version for the
repo.

Change-Id: I9c32b41ef865a09587f3ebfe8b8a896031fbd285
Signed-off-by: Tim Rozet <trozet@redhat.com>
This commit is contained in:
Tim Rozet 2017-06-02 09:49:59 -04:00
parent 43048c5be9
commit c3b0e78212
4 changed files with 8 additions and 8 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

@ -15,7 +15,7 @@ RUN pip --no-cache-dir install /plugins/*
{{ macros.install_packages(opendaylight_packages | customizable("packages")) }} {{ macros.install_packages(opendaylight_packages | customizable("packages")) }}
{% if opendaylight_distro is not defined %} {% if opendaylight_distro is not defined %}
{% set opendaylight_distro = 'distribution-karaf-0.5.3-Boron-SR3' %} {% set opendaylight_distro = 'distribution-karaf-0.6.0-Carbon' %}
{% endif %} {% endif %}
ADD opendaylight-archive /opendaylight ADD opendaylight-archive /opendaylight
RUN ln -s /opendaylight/{{ opendaylight_distro }} /opt/opendaylight RUN ln -s /opendaylight/{{ opendaylight_distro }} /opt/opendaylight

8
doc/template-override/opendaylight-source.rst
View File

@ -21,17 +21,17 @@ Building OpenDaylight Containers
- Change `opendaylight_distro` to match the folder where OpenDaylight - Change `opendaylight_distro` to match the folder where OpenDaylight
build resides. For example, if using prebuilt archive from OpenDaylight build resides. For example, if using prebuilt archive from OpenDaylight
downloads `distribution-karaf-0.5.3-Boron-SR3.tar.gz` becomes downloads `distribution-karaf-0.6.0-Carbon.tar.gz` becomes
`distribution-karaf-0.5.3-Boron-SR3`. `distribution-karaf-0.6.0-Carbon`.
kolla-build.conf kolla-build.conf
________________ ________________
.. code-block:: console .. code-block:: console
opendaylight_distro = distribution-karaf-0.5.3-Boron-SR3 opendaylight_distro = distribution-karaf-0.6.0-Carbon
[opendaylight] [opendaylight]
type = url type = url
location = https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.5.3-Boron-SR3/distribution-karaf-0.5.3-Boron-SR3.tar.gz location = https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.0-Carbon/distribution-karaf-0.6.0-Carbon.tar.gz
Build the container (source or binary) by executing the following command: Build the container (source or binary) by executing the following command:

2
docker/opendaylight/opendaylight.repo
View File

@ -1,5 +1,5 @@
[opendaylight] [opendaylight]
name=CentOS CBS OpenDaylight Release Repository name=CentOS CBS OpenDaylight Release Repository
baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-5-release/x86_64/os/ baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-6-release/x86_64/os/
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0

4
kolla/common/config.py
View File

@ -539,8 +539,8 @@ SOURCES = {
'type': 'url', 'type': 'url',
'location': ('https://nexus.opendaylight.org/content/' 'location': ('https://nexus.opendaylight.org/content/'
'repositories/opendaylight.release/org/opendaylight/' 'repositories/opendaylight.release/org/opendaylight/'
'integration/distribution-karaf/0.5.3-Boron-SR3/' 'integration/distribution-karaf/0.6.0-Carbon/'
'distribution-karaf-0.5.3-Boron-SR3.tar.gz')}, 'distribution-karaf-0.6.0-Carbon.tar.gz')},
'panko-base': { 'panko-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/panko/' 'location': ('$tarballs_base/panko/'