aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorJeffrey Zhang <zhang.lei.fly@gmail.com>2018-03-08 23:35:54 +0800
committerJeffrey Zhang <zhang.lei.fly@gmail.com>2018-05-26 00:24:30 +0800
commit14374e715d2a5057a28126c7193cfb6270eabaab (patch)
treec3690c24b38273eb5e6a812d1eef6f32e135c2a2 /kolla
parent000159cb6d5da0fffe0ba73051c6c551a0cdd9bd (diff)
downloadkolla-14374e715d2a5057a28126c7193cfb6270eabaab.tar.gz
kolla-14374e715d2a5057a28126c7193cfb6270eabaab.zip
Bump Ubuntu base image to 18.04
Ubuntu 18.04 has been released. We need upgrade to it this cycle. Changes made in this patch - Bump ubuntu repo from xenial to bionic. Some repos do not have bionic packages, so still using xenial repos. - Drop mariadb, percona and nfs-ganesha repo, because these packages are already provided by Ubuntu official repo. - Since qdrouterd does not have bionic repo and xenial packages does not work on Ubuntu bionic, just add it into ignore image list. - Use python-rtslib-fb and targetcli-fb rather than python-rtslib and targetcli - use xen-utils package name rather than with package version one. - Seems unsigned repo won't work on Ubuntu bionic, stop using infra mirrored unsigned repo in gate building job. Needed-By: https://review.openstack.org/568728 Implement blueprint: ubuntu-bionic Change-Id: I4e3b0ca669cfbf6316bf591f2d8428fa1a0d6182
Diffstat (limited to 'kolla')
-rwxr-xr-xkolla/common/config.py4
-rwxr-xr-xkolla/image/build.py4
2 files changed, 6 insertions, 2 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index fd7aca134..cede24cad 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -26,14 +26,14 @@ DEFAULT_BASE_TAGS = {
'rhel': '7',
'oraclelinux': '7-slim',
'debian': 'stretch-backports',
- 'ubuntu': '16.04',
+ 'ubuntu': '18.04',
}
DISTRO_RELEASE = {
'centos': '7',
'rhel': '7',
'oraclelinux': '7',
'debian': 'stretch-backports',
- 'ubuntu': '16.04',
+ 'ubuntu': '18.04',
}
# This is noarch repository so we will use it on all architectures
diff --git a/kolla/image/build.py b/kolla/image/build.py
index cd59aa260..54e3d7970 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -121,6 +121,8 @@ SKIPPED_IMAGES = {
"nova-mksproxy",
"novajoin-base",
"octavia-base",
+ # There is no qdrouterd package for ubuntu bionic
+ "qdrouterd",
"searchlight-base",
"solum-base",
"tacker-base",
@@ -134,6 +136,8 @@ SKIPPED_IMAGES = {
# TODO(spsurya): remove neutron-server-opendaylight fix below issue
# https://bugs.launchpad.net/kolla/+bug/1764621
"neutron-server-opendaylight",
+ # There is no qdrouterd package for ubuntu bionic
+ "qdrouterd",
# TODO(jeffrey4l): remove tripleo-ui when following bug is fixed
# https://bugs.launchpad.net/tripleo/+bug/1744215
"tripleo-ui"