debian: move to stretch
Debian 'jessie' even with backports lacks some packages Kolla expects. Due to this we (Linaro) move to Debian 'stretch' release with our OpenStack work. Stretch is now frozen so there should not be many changes. Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: Iab7232cbe6f8fc3e3de10c67f3d89f134b185f05
This commit is contained in:
Marcin Juszkiewicz
parent
5e15e813c2
commit
f98a8d6287
|
|
@ -313,7 +313,7 @@ RUN sed -i \
|
|||
&& ln -s dist-packages /usr/lib/python2.7/site-packages
|
||||
{% endif %}
|
||||
|
||||
{# endif for base_distro ubuntu, debian #}
|
||||
{# endif for base_distro debian, ubuntu #}
|
||||
{% endif %}
|
||||
|
||||
COPY set_configs.py /usr/local/bin/kolla_set_configs
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
Package: *
|
||||
Pin: origin "nyc2.mirrors.digitalocean.com"
|
||||
Pin-Priority: 500
|
||||
|
||||
Package: python-rtslib
|
||||
Pin: release o=Debian,a=testing,n=stretch,l=Debian
|
||||
Pin-Priority: 500
|
||||
|
||||
Package: targetcli
|
||||
Pin: release o=Debian,a=testing,n=stretch,l=Debian
|
||||
Pin-Priority: 500
|
||||
|
||||
Package: python-configshell
|
||||
Pin: release o=Debian,a=testing,n=stretch,l=Debian
|
||||
Pin-Priority: 500
|
||||
|
||||
Package: *
|
||||
Pin: release o=Debian,a=testing,n=stretch,l=Debian
|
||||
Pin-Priority: -1
|
||||
|
|
@ -1,35 +1,5 @@
|
|||
# Default repos
|
||||
deb http://httpredir.debian.org/debian jessie main
|
||||
|
||||
# jessie-backports
|
||||
deb http://httpredir.debian.org/debian jessie-backports main contrib
|
||||
|
||||
# jessie-updates, previously known as 'volatile'
|
||||
deb http://httpredir.debian.org/debian jessie-updates main
|
||||
deb http://deb.debian.org/debian stretch main
|
||||
|
||||
# debian security updates
|
||||
deb http://security.debian.org jessie/updates main
|
||||
|
||||
# need some packages from testing not available in stable
|
||||
deb http://httpredir.debian.org/debian stretch main
|
||||
|
||||
# Ceph repo
|
||||
deb http://download.ceph.com/debian-jewel/ jessie main
|
||||
|
||||
# Maria DB repo
|
||||
deb [arch=amd64,i386] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/debian jessie main
|
||||
|
||||
# Kibana repo
|
||||
deb https://packages.elastic.co/kibana/4.6/debian stable main
|
||||
|
||||
# docker
|
||||
deb http://apt.dockerproject.org/repo debian-jessie main
|
||||
|
||||
# InfluxDB repo
|
||||
deb https://repos.influxdata.com/debian jessie stable
|
||||
|
||||
# Grafana repo
|
||||
deb https://packagecloud.io/grafana/stable/debian/ jessie main
|
||||
|
||||
# Fluentd repo
|
||||
deb http://packages.treasuredata.com/2/debian/jessie/ jessie contrib
|
||||
deb http://security.debian.org stretch/updates main
|
||||
|
|
|
|||
|
|
@ -43,9 +43,14 @@ MAINTAINER {{ maintainer }}
|
|||
'python-dev'
|
||||
] %}
|
||||
|
||||
{% if base_distro == 'debian' %}
|
||||
{% set os_client_config='/usr/local/lib/python2.7/dist-packages/os_client_config/defaults.json' %}
|
||||
{% endif %}
|
||||
# Debian/stretch ships libmysqlclient.so in separate package
|
||||
{% if base_distro == 'debian' %}
|
||||
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
|
||||
'libmariadbclient-dev-compat'
|
||||
] %}
|
||||
|
||||
{% set os_client_config='/usr/local/lib/python2.7/dist-packages/os_client_config/defaults.json' %}
|
||||
{% endif %}
|
||||
|
||||
{% endif %}
|
||||
{{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}
|
||||
|
|
|
|||
|
|
@ -23,10 +23,18 @@ MAINTAINER {{ maintainer }}
|
|||
{% elif base_distro in ['debian', 'ubuntu'] %}
|
||||
{% set mariadb_packages = [
|
||||
'expect',
|
||||
'mariadb-galera-server',
|
||||
'percona-xtrabackup',
|
||||
'socat'
|
||||
] %}
|
||||
{% if base_distro == 'debian' %}
|
||||
{% set mariadb_packages = mariadb_packages + [
|
||||
'mariadb-server'
|
||||
] %}
|
||||
{% else %}
|
||||
{% set mariadb_packages = mariadb_packages + [
|
||||
'mariadb-galera-server',
|
||||
'percona-xtrabackup'
|
||||
] %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{{ macros.install_packages(mariadb_packages | customizable("packages")) }}
|
||||
|
|
|
|||
|
|
@ -40,13 +40,13 @@ MAINTAINER {{ maintainer }}
|
|||
'ceph-common',
|
||||
'dmidecode',
|
||||
'ebtables',
|
||||
'libvirt-bin',
|
||||
'libvirt-clients',
|
||||
'openvswitch-switch',
|
||||
'pm-utils',
|
||||
'qemu',
|
||||
'qemu-block-extra',
|
||||
'usermode',
|
||||
'xen-utils-4.4'
|
||||
'xen-utils-4.8'
|
||||
] %}
|
||||
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -237,6 +237,13 @@ ENV DEBIAN_FRONTEND noninteractive
|
|||
'python-dev',
|
||||
'zip'
|
||||
] %}
|
||||
|
||||
# Debian/stretch ships libmysqlclient.so in separate package
|
||||
{% if base_distro == 'debian' %}
|
||||
{% set openstack_base_packages = openstack_base_packages + [
|
||||
'libmariadbclient-dev-compat'
|
||||
] %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{{ macros.install_packages(openstack_base_packages | customizable("packages")) }}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ DISTRO_RELEASE = {
|
|||
'centos': '7',
|
||||
'rhel': '7',
|
||||
'oraclelinux': '7',
|
||||
'debian': '8',
|
||||
'debian': 'stretch',
|
||||
'ubuntu': '16.04',
|
||||
}
|
||||
DELOREAN = \
|
||||
|
|
|
|||
Loading…
Reference in New Issue