openstack/kolla
Code Issues Proposed changes

Merge "Bump Ubuntu base image to 18.04"

Browse Source
This commit is contained in:
Zuul 2018-06-04 10:39:19 +00:00 committed by Gerrit Code Review
commit 5caa5e30de
14 changed files with 50 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docker/base/sources.list.ubuntu
View File

@ -1,41 +1,29 @@
# For non-x86 architectures we use sources.list.debian.ARCHITECTURENAME
# Default repos
deb http://archive.ubuntu.com/ubuntu/ xenial main restricted universe multiverse
deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe multiverse
deb http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse
deb http://archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse
deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse
deb http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
# Backports have a lower priority and must be explicitly installed to be used
deb http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse
deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse
# We need to add the repo for the updated packages they provide. The main ones
# are qemu, libvirt, and openvswitch.
deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/queens main
# MariaDB 10.0 repo
deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu xenial main
# Percona repo (for xtrabackup)
deb http://repo.percona.com/apt xenial main
# Elastic repo
deb https://packages.elastic.co/elasticsearch/2.x/debian stable main
# Kibana repo
deb https://packages.elastic.co/kibana/4.6/debian stable main
# Docker repo
deb http://apt.dockerproject.org/repo ubuntu-xenial main
# InfluxDB repo
deb https://repos.influxdata.com/ubuntu xenial stable
deb https://repos.influxdata.com/ubuntu bionic stable
# Grafana repo
deb https://packagecloud.io/grafana/stable/debian/ jessie main
# Nfs-ganesha repo
deb http://download.ceph.com/nfs-ganesha/deb-V2.5-stable/luminous xenial main
# Fluentd repo
deb http://packages.treasuredata.com/2/ubuntu/xenial/ xenial contrib

8
docker/base/sources.list.ubuntu.aarch64
View File

@ -1,10 +1,10 @@
# Default repos
deb http://ports.ubuntu.com/ xenial main restricted universe multiverse
deb http://ports.ubuntu.com/ xenial-updates main restricted universe multiverse
deb http://ports.ubuntu.com/ xenial-security main restricted universe multiverse
deb http://ports.ubuntu.com/ bionic main restricted universe multiverse
deb http://ports.ubuntu.com/ bionic-updates main restricted universe multiverse
deb http://ports.ubuntu.com/ bionic-security main restricted universe multiverse
# Backports have a lower priority and must be explicitly installed to be used
deb http://ports.ubuntu.com/ xenial-backports main restricted universe multiverse
deb http://ports.ubuntu.com/ bionic-backports main restricted universe multiverse
# We need to add the repo for the updated packages they provide. The main ones
# are qemu, libvirt, and openvswitch.

11
docker/base/sources.list.ubuntu.ppc64le
View File

@ -1,14 +1,11 @@
# Default repos
deb http://ports.ubuntu.com/ xenial main restricted universe multiverse
deb http://ports.ubuntu.com/ xenial-updates main restricted universe multiverse
deb http://ports.ubuntu.com/ xenial-security main restricted universe multiverse
deb http://ports.ubuntu.com/ bionic main restricted universe multiverse
deb http://ports.ubuntu.com/ bionic-updates main restricted universe multiverse
deb http://ports.ubuntu.com/ bionic-security main restricted universe multiverse
# Backports have a lower priority and must be explicitly installed to be used
deb http://ports.ubuntu.com/ xenial-backports main restricted universe multiverse
deb http://ports.ubuntu.com/ bionic-backports main restricted universe multiverse
# We need to add the repo for the updated packages they provide. The main ones
# are qemu, libvirt, and openvswitch.
deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/queens main
# Mariadb
deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu xenial main

6
docker/ceph/ceph-nfs/Dockerfile.j2
View File

@ -9,14 +9,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set ceph_nfs_packages = [
'nfs-ganesha',
'nfs-ganesha-ceph',
'nfs-ganesha-rgw'
'nfs-ganesha-ceph'
] %}
{% elif base_distro in ['ubuntu'] %}
{% set ceph_nfs_packages = [
'nfs-ganesha',
'nfs-ganesha-ceph',
'nfs-ganesha-rgw'
'nfs-ganesha-ceph'
] %}
{% endif %}

28
docker/cinder/cinder-volume/Dockerfile.j2
View File

@ -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 %}

2
docker/dind/Dockerfile.j2
View File

@ -15,7 +15,7 @@ RUN /bin/true
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set dind_packages = [
'btrfs-tools',
'docker-engine',
'docker.io',
'openssh-server'
] %}

17
docker/iscsid/Dockerfile.j2
View File

@ -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")) }}

15
docker/mariadb/Dockerfile.j2
View File

@ -29,17 +29,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'mariadb-server'
] %}
{% else %}
{% if base_arch == 'aarch64' %}
{% set mariadb_packages = mariadb_packages + [
'mariadb-server',
'percona-xtrabackup'
] %}
{% else %}
{% set mariadb_packages = mariadb_packages + [
'mariadb-galera-server',
'percona-xtrabackup'
] %}
{% endif %}
{% set mariadb_packages = mariadb_packages + [
'mariadb-server',
'percona-xtrabackup'
] %}
{% endif %}
{% endif %}

28
docker/nova/nova-compute/Dockerfile.j2
View File

@ -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 %}

12
docker/nova/nova-libvirt/Dockerfile.j2
View File

@ -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 %}
@ -52,17 +53,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'libpam-systemd/stretch-backports',
'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 %}

4
kolla/common/config.py
View File

@ -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

4
kolla/image/build.py
View File

@ -124,6 +124,8 @@ SKIPPED_IMAGES = {
"nova-mksproxy",
"novajoin-base",
"octavia-base",
# There is no qdrouterd package for ubuntu bionic
"qdrouterd",
"searchlight-base",
"solum-base",
"tacker-base",
@ -137,6 +139,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"

3
releasenotes/notes/upgrade-ubuntu-base-image-to-bionic-eb0d421014ed48ac.yaml Normal file
View File

@ -0,0 +1,3 @@
---
upgrade:
- Ubuntu base image is upgrade from xenial to bionic.

9
tests/templates/template_overrides.j2
View File

@ -63,10 +63,11 @@ RUN sed -i -e "/^mirrorlist/d" \
{% elif base_distro == "ubuntu" %}
{% endraw %}
RUN sed -i -e "s|http://archive.ubuntu.com|http://{{ nodepool_mirror_host }}|" \
-e "s|http://ubuntu-cloud.archive.canonical.com/ubuntu|http://{{ nodepool_mirror_host }}/ubuntu-cloud-archive|" \
/etc/apt/sources.list \
&& apt-get update
# FIXME(jeffrey4l): seems we can not use unsigned repo in ubuntu 18.04
#RUN sed -i -e "s|http://archive.ubuntu.com|http://{{ nodepool_mirror_host }}|" \
# -e "s|http://ubuntu-cloud.archive.canonical.com/ubuntu|http://{{ nodepool_mirror_host }}/ubuntu-cloud-archive|" \
# /etc/apt/sources.list \
# && apt-get update
{% raw %}
{% endif %}