diff options
| author | Tim Rozet <trozet@redhat.com> | 2017-06-02 09:49:59 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-06-02 16:13:15 -0400 |
| commit | c3b0e782121f427ed9748b7eb2a1fc5367fa89a1 (patch) | |
| tree | 6b0d41ae288ffe88af084cf187e80f9b01fb7e94 | |
| parent | 43048c5be93dafb2d3ffa7943d504774cf92f123 (diff) | |
| download | kolla-c3b0e782121f427ed9748b7eb2a1fc5367fa89a1.tar.gz kolla-c3b0e782121f427ed9748b7eb2a1fc5367fa89a1.zip | |
Updates opendaylight repo for Carbon release
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>
| -rw-r--r-- | contrib/template-override/opendaylight-template-overrides.j2 | 2 | ||||
| -rw-r--r-- | doc/template-override/opendaylight-source.rst | 8 | ||||
| -rw-r--r-- | docker/opendaylight/opendaylight.repo | 2 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/contrib/template-override/opendaylight-template-overrides.j2 b/contrib/template-override/opendaylight-template-overrides.j2 index e9f6cf38e..f6e1777ba 100644 --- a/contrib/template-override/opendaylight-template-overrides.j2 +++ b/contrib/template-override/opendaylight-template-overrides.j2 @@ -15,7 +15,7 @@ RUN pip --no-cache-dir install /plugins/* {{ macros.install_packages(opendaylight_packages | customizable("packages")) }} {% 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 %} ADD opendaylight-archive /opendaylight RUN ln -s /opendaylight/{{ opendaylight_distro }} /opt/opendaylight diff --git a/doc/template-override/opendaylight-source.rst b/doc/template-override/opendaylight-source.rst index 59ea9e36b..36b0af3d5 100644 --- a/doc/template-override/opendaylight-source.rst +++ b/doc/template-override/opendaylight-source.rst @@ -21,17 +21,17 @@ Building OpenDaylight Containers - Change `opendaylight_distro` to match the folder where OpenDaylight build resides. For example, if using prebuilt archive from OpenDaylight - downloads `distribution-karaf-0.5.3-Boron-SR3.tar.gz` becomes - `distribution-karaf-0.5.3-Boron-SR3`. + downloads `distribution-karaf-0.6.0-Carbon.tar.gz` becomes + `distribution-karaf-0.6.0-Carbon`. kolla-build.conf ________________ .. code-block:: console - opendaylight_distro = distribution-karaf-0.5.3-Boron-SR3 + opendaylight_distro = distribution-karaf-0.6.0-Carbon [opendaylight] 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: diff --git a/docker/opendaylight/opendaylight.repo b/docker/opendaylight/opendaylight.repo index bf99023f8..8c0c299fd 100644 --- a/docker/opendaylight/opendaylight.repo +++ b/docker/opendaylight/opendaylight.repo @@ -1,5 +1,5 @@ [opendaylight] 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 gpgcheck=0 diff --git a/kolla/common/config.py b/kolla/common/config.py index d068e81ab..ac0a77df5 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -539,8 +539,8 @@ SOURCES = { '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')}, + 'integration/distribution-karaf/0.6.0-Carbon/' + 'distribution-karaf-0.6.0-Carbon.tar.gz')}, 'panko-base': { 'type': 'url', 'location': ('$tarballs_base/panko/' |