aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-10-31 08:11:14 +0000
committerGerrit Code Review <review@openstack.org>2017-10-31 08:11:14 +0000
commitc1b004a110c62b646efd57195957bc75bfabd17b (patch)
treefbe0704c8b2a111c7d9f694deddf40688980a853
parent568f131ab6be29b8814ce802535ccceea4e2fd6b (diff)
parent9cea40089285f3353093f94ea9fd772de404e3a1 (diff)
downloadkolla-c1b004a110c62b646efd57195957bc75bfabd17b.tar.gz
kolla-c1b004a110c62b646efd57195957bc75bfabd17b.zip
Merge "update "opendaylight" tar"
-rw-r--r--doc/source/admin/template-override/opendaylight-source.rst2
-rwxr-xr-xkolla/common/config.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/source/admin/template-override/opendaylight-source.rst b/doc/source/admin/template-override/opendaylight-source.rst
index 61a3415ba..d97d1b828 100644
--- a/doc/source/admin/template-override/opendaylight-source.rst
+++ b/doc/source/admin/template-override/opendaylight-source.rst
@@ -18,7 +18,7 @@ Point to the desired version of OpenDaylight in `kolla-build.conf`:
[opendaylight]
type = url
- 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
+ location = https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.2-Carbon/distribution-karaf-0.6.2-Carbon.tar.gz
Build the container by executing the following command:
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 3b650ca1c..56910be96 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -587,8 +587,8 @@ SOURCES = {
'type': 'url',
'location': ('https://nexus.opendaylight.org/content/'
'repositories/opendaylight.release/org/opendaylight/'
- 'integration/distribution-karaf/0.6.1-Carbon/'
- 'distribution-karaf-0.6.1-Carbon.tar.gz')},
+ 'integration/distribution-karaf/0.6.2-Carbon/'
+ 'distribution-karaf-0.6.2-Carbon.tar.gz')},
'panko-base': {
'type': 'url',
'location': ('$tarballs_base/panko/'