14374e715d
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
32 lines
882 B
Django/Jinja
32 lines
882 B
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
|
|
{% block iscsid_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
|
{% set iscsid_packages = [
|
|
'iscsi-initiator-utils',
|
|
'python-rtslib',
|
|
'targetcli'
|
|
] %}
|
|
|
|
{% elif base_distro in ['debian', 'ubuntu'] %}
|
|
{% set iscsid_packages = [
|
|
'open-iscsi',
|
|
'python-rtslib-fb',
|
|
'targetcli-fb'
|
|
] %}
|
|
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(iscsid_packages | customizable("packages")) }}
|
|
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
RUN chmod 755 /usr/local/bin/kolla_extend_start \
|
|
&& rm /etc/iscsi/initiatorname.iscsi
|
|
|
|
{% block iscsid_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|