From 14374e715d2a5057a28126c7193cfb6270eabaab Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Thu, 8 Mar 2018 23:35:54 +0800
Subject: 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
---
 kolla/common/config.py | 4 ++--
 kolla/image/build.py   | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'kolla')

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"
-- 
cgit v1.2.3