Merge "debian: move to stretch"

8 files changed, 31 insertions, 60 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index bd3dec754..f0fc38074 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -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
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
index 65b9de467..e69de29bb 100644
--- a/docker/base/apt_preferences.debian
+++ b/docker/base/apt_preferences.debian
@@ -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
diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian
index f1195c943..19b16d5fb 100644
--- a/docker/base/sources.list.debian
+++ b/docker/base/sources.list.debian
@@ -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
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index e15958af8..c2b6d1265 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -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")) }}
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2
index 74834f9fb..5f4bc5da1 100644
--- a/docker/mariadb/Dockerfile.j2
+++ b/docker/mariadb/Dockerfile.j2
@@ -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")) }}
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index 7adb7ba3a..504994864 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -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 %}
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 38edfcc08..49b6bbe20 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -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")) }}
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 6001c0c64..01a4a1f7f 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -24,7 +24,7 @@ DISTRO_RELEASE = {
     'centos': '7',
     'rhel': '7',
     'oraclelinux': '7',
-    'debian': '8',
+    'debian': 'stretch',
     'ubuntu': '16.04',
 }
 DELOREAN = \