Browse code
Update default ETCD_VERSION to latest 3.2 etcd release
This updates the default ETCD_VERSION to the latest 3.2 etcd release,
v3.2.17. 3.2 is chosen as it is packaged in bionic and fedora; we
hope to move to packaged versions for distros that support it in due
course.
This version supports arm64 and ppc64le which were not supported by the
previous default, v3.1.10.
We have removed the override to tarballs.o.o, as these files are now
cached as described in [1]
[1] http://lists.openstack.org/pipermail/openstack-infra/2018-March/005871.html
Depends-On: https://review.openstack.org/556688
Change-Id: I5103b4331a8d7c5660848fc148ebe4139ce6dad9
esberglu authored on 2018/03/22 01:04:37Showing 2 changed files
| ... | ... |
@@ -116,10 +116,6 @@ |
| 116 | 116 |
ERROR_ON_CLONE: true |
| 117 | 117 |
# Gate jobs can't deal with nested virt. Disable it. |
| 118 | 118 |
LIBVIRT_TYPE: qemu |
| 119 |
- # NOTE(dims): etcd 3.x is not available in debian/ubuntu |
|
| 120 |
- # etc. As a stop gap measure, devstack uses wget to download |
|
| 121 |
- # from the location below for all the CI jobs. |
|
| 122 |
- ETCD_DOWNLOAD_URL: http://tarballs.openstack.org/etcd/ |
|
| 123 | 119 |
devstack_services: |
| 124 | 120 |
# Ignore any default set by devstack. Emit a "disable_all_services". |
| 125 | 121 |
base: false |
| ... | ... |
@@ -183,7 +179,6 @@ |
| 183 | 183 |
NOVNC_FROM_PACKAGE: true |
| 184 | 184 |
ERROR_ON_CLONE: true |
| 185 | 185 |
LIBVIRT_TYPE: qemu |
| 186 |
- ETCD_DOWNLOAD_URL: http://tarballs.openstack.org/etcd/ |
|
| 187 | 186 |
devstack_services: |
| 188 | 187 |
base: false |
| 189 | 188 |
pre-run: playbooks/pre.yaml |
| ... | ... |
@@ -737,11 +737,11 @@ fi |
| 737 | 737 |
EXTRA_CACHE_URLS="" |
| 738 | 738 |
|
| 739 | 739 |
# etcd3 defaults |
| 740 |
-ETCD_VERSION=${ETCD_VERSION:-v3.1.10}
|
|
| 741 |
-ETCD_SHA256_AMD64=${ETCD_SHA256_AMD64:-"2d335f298619c6fb02b1124773a56966e448ad9952b26fea52909da4fe80d2be"}
|
|
| 742 |
-# NOTE(sdague): etcd v3.1.10 doesn't have anything for these architectures, though 3.2.x does. |
|
| 743 |
-ETCD_SHA256_ARM64=${ETCD_SHA256_ARM64:-""}
|
|
| 744 |
-ETCD_SHA256_PPC64=${ETCD_SHA256_PPC64:-""}
|
|
| 740 |
+ETCD_VERSION=${ETCD_VERSION:-v3.2.17}
|
|
| 741 |
+ETCD_SHA256_AMD64=${ETCD_SHA256_AMD64:-"0a75e794502e2e76417b19da2807a9915fa58dcbf0985e397741d570f4f305cd"}
|
|
| 742 |
+ETCD_SHA256_ARM64=${ETCD_SHA256_ARM64:-"0ab4621c44c79d17d94e43bd184d0f23b763a3669056ce4ae2d0b2942410a98f"}
|
|
| 743 |
+ETCD_SHA256_PPC64=${ETCD_SHA256_PPC64:-"69e1279c4a2a52256b78d2a8dd23346ac46b836e678b971a459f2afaef3c275e"}
|
|
| 744 |
+# etcd v3.3.2 doesn't have anything for s390x |
|
| 745 | 745 |
ETCD_SHA256_S390X=${ETCD_SHA256_S390X:-""}
|
| 746 | 746 |
# Make sure etcd3 downloads the correct architecture |
| 747 | 747 |
if is_arch "x86_64"; then |