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
---
 docker/nova/nova-compute/Dockerfile.j2 | 28 ++++++++--------------------
 docker/nova/nova-libvirt/Dockerfile.j2 | 12 +-----------
 2 files changed, 9 insertions(+), 31 deletions(-)

(limited to 'docker/nova')

diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index de8f1c821..6138fc399 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -44,21 +44,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python-guestfs',
             'python-ironicclient',
             'python-oslo.vmware',
-            'sysfsutils'
+            'python-rtslib-fb',
+            'sysfsutils',
+            'targetcli-fb'
         ] %}
 
-        # Debian/stretch uses rtslib-fb (like CentOS does)
         # systemd is needed to get python-guestfs installed
         {% if base_distro == 'debian' %}
             {% set nova_compute_packages = nova_compute_packages + [
-                'python-rtslib-fb',
-                'systemd/stretch-backports',
-                'targetcli-fb'
-            ] %}
-        {% elif base_distro == 'ubuntu' %}
-            {% set nova_compute_packages = nova_compute_packages + [
-                'python-rtslib',
-                'targetcli'
+                'systemd/stretch-backports'
             ] %}
         {% endif %}
 
@@ -103,7 +97,9 @@ RUN rm -f /etc/nova/nova-compute.conf
             'parted',
             'python-guestfs',
             'python-libvirt',
-            'qemu-utils'
+            'python-rtslib-fb',
+            'qemu-utils',
+            'targetcli-fb'
         ] %}
 
         {% if base_arch == "aarch64" %}
@@ -112,18 +108,10 @@ RUN rm -f /etc/nova/nova-compute.conf
             ] %}
         {% endif %}
 
-        # Debian/stretch uses rtslib-fb (like CentOS does)
         # systemd is needed to get python-guestfs installed
         {% if base_distro == 'debian' %}
             {% set nova_compute_packages = nova_compute_packages + [
-                'python-rtslib-fb',
-                'systemd/stretch-backports',
-                'targetcli-fb'
-            ] %}
-        {% elif base_distro == 'ubuntu' %}
-            {% set nova_compute_packages = nova_compute_packages + [
-                'python-rtslib',
-                'targetcli'
+                'systemd/stretch-backports'
             ] %}
         {% endif %}
 
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index f830a0a6e..fcd6aecb4 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -44,6 +44,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% if base_arch != "ppc64le" %}
         {% set nova_libvirt_packages = nova_libvirt_packages + [
             'dmidecode',
+            'xen-utils'
         ] %}
     {% endif %}
 
@@ -51,17 +52,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         {% set nova_libvirt_packages = nova_libvirt_packages + [
             'usermode'
         ] %}
-        {% if base_arch != "ppc64le" %}
-            {% set nova_libvirt_packages = nova_libvirt_packages + [
-                'xen-utils-4.8'
-            ] %}
-        {% endif %}
-    {% elif base_distro in ['ubuntu'] %}
-        {% if base_arch != "ppc64le" %}
-            {% set nova_libvirt_packages = nova_libvirt_packages + [
-                'xen-utils-4.6'
-            ] %}
-        {% endif %}
     {% endif %}
 {% endif %}
 
-- 
cgit v1.2.3