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

1 files changed, 4 insertions, 24 deletions

diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index fb3763643..6632bdbe4 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -23,22 +23,12 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
     {% set cinder_volume_packages = [
             'nfs-common',
             'sysfsutils',
+            'python-rtslib-fb',
+            'targetcli-fb',
             'thin-provisioning-tools',
             'tgt'
     ] %}
 
-    # Debian/stretch uses rtslib-fb (like CentOS does)
-    {% if base_distro == 'debian' %}
-        {% set cinder_volume_packages = cinder_volume_packages + [
-            'python-rtslib-fb',
-            'targetcli-fb'
-        ] %}
-    {% elif base_distro == 'ubuntu' %}
-        {% set cinder_volume_packages = cinder_volume_packages + [
-            'python-rtslib',
-            'targetcli'
-        ] %}
-    {% endif %}
 {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
 
 {% block cinder_volume_ubuntu_setup %}
@@ -51,21 +41,11 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
     {% if base_distro in ['debian', 'ubuntu'] %}
         {% set cinder_volume_packages = [
                 'cinder-volume',
+                'python-rtslib-fb',
+                'targetcli-fb',
                 'thin-provisioning-tools'
         ] %}
 
-        # Debian/stretch uses rtslib-fb (like CentOS does)
-        {% if base_distro == 'debian' %}
-            {% set cinder_volume_packages = cinder_volume_packages + [
-                'python-rtslib-fb',
-                'targetcli-fb'
-            ] %}
-        {% elif base_distro == 'ubuntu' %}
-            {% set cinder_volume_packages = cinder_volume_packages + [
-                'python-rtslib',
-                'targetcli'
-            ] %}
-        {% endif %}
 {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
     {% endif %}