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, 3 insertions, 14 deletions

diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2
index dd5e73560..ebb5d985d 100644
--- a/docker/iscsid/Dockerfile.j2
+++ b/docker/iscsid/Dockerfile.j2
@@ -14,22 +14,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% elif base_distro in ['debian', 'ubuntu'] %}
     {% set iscsid_packages = [
-        'open-iscsi'
+        'open-iscsi',
+        'python-rtslib-fb',
+        'targetcli-fb'
     ] %}
 
-    # Debian/stretch uses rtslib-fb (like CentOS does)
-    {% if base_distro == 'debian' %}
-       {% set iscsid_packages = iscsid_packages + [
-            'python-rtslib-fb',
-            'targetcli-fb'
-       ] %}
-    {% elif base_distro == 'ubuntu' %}
-       {% set iscsid_packages = iscsid_packages + [
-            'python-rtslib',
-            'targetcli'
-       ] %}
-    {% endif %}
-
 {% endif %}
 
 {{ macros.install_packages(iscsid_packages | customizable("packages"))  }}