Merge upstream stable/stein

Change-Id: I9d28bb6f656c39acf36b5b2ee8113b03ea176cd9

Author: jovial

docker/aodh/aodh-api/extend_start.sh

@@ -5,6 +5,7 @@
 if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
     # Loading Apache2 ENV variables
     . /etc/apache2/envvars
+    install -d /var/run/apache2/
     rm -rf /var/run/apache2/*
 else
     rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*

docker/barbican/barbican-api/extend_start.sh

@@ -14,6 +14,7 @@ if [[ "$(whoami)" == 'root' ]]; then
     if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
         # Loading Apache2 ENV variables
         . /etc/apache2/envvars
+        install -d /var/run/apache2/
         rm -rf /var/run/apache2/*
     else
         rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*

docker/base/Dockerfile.j2

@@ -295,10 +295,12 @@ COPY sources.list.{{ base_distro }} /etc/apt/sources.list
 {% else %}
 COPY sources.list.{{ base_distro }}.{{ base_arch }} /etc/apt/sources.list
 {% endif %}
+COPY sources.list /etc/apt/sources.list.d/kolla-custom.list
 {% endblock %}
 
 {% block base_ubuntu_package_apt_preferences %}
 COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
+COPY apt_preferences /etc/apt/preferences.d/kolla-custom
 {% endblock %}
 
 {% set base_apt_packages = [

docker/base/apt_preferences

@@ -0,0 +1 @@
+# used for adding custom options by 'apt_preferences' option of kolla-build.conf

docker/base/apt_preferences.debian

@@ -0,0 +1,29 @@
+# We do not want packages from this repo
+Package: *
+Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster
+Pin-Priority: 100
+
+# Unless it is kibana (on aarch64)
+Package: kibana
+Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster
+Pin-Priority: 600
+
+# on x86-64 use upstream package for kibana
+Package: kibana
+Pin: release o=elastic,b=amd64
+Pin-Priority: 700
+
+# We need fixed libvirt for aarch64
+Package: *libvirt*
+Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster
+Pin-Priority: 600
+
+# on x86-64 we want libvirt from Debian
+Package: *libvirt*
+Pin: release o=Debian,b=amd64
+Pin-Priority: 700
+
+# on ppc64le we want libvirt from Debian
+Package: *libvirt*
+Pin: release o=Debian,b=ppc64le
+Pin-Priority: 700

docker/base/sources.list

@@ -0,0 +1 @@
+# used for adding custom repos by 'apt_sources_list' option of kolla-build.conf

docker/base/sources.list.debian

@@ -18,3 +18,6 @@ deb http://buster-stein.debian.net/debian buster-stein-backports-nochange main
 
 # td-agent for fluentd
 deb http://packages.treasuredata.com/3/debian/stretch stretch contrib
+
+# kibana for non-x86 and fixed libvirt for aarch64
+deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./

docker/cinder/cinder-api/extend_start.sh

@@ -9,7 +9,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
 fi
 
 if [[ "${!KOLLA_OSM[@]}" ]]; then
-    if [[ -z ${MAX_NUMBER} ]]; then
+    if [[ "${!MAX_NUMBER[@]}" ]]; then
         cinder-manage db online_data_migrations --max_count ${MAX_NUMBER}
     else
         cinder-manage db online_data_migrations
@@ -24,6 +24,7 @@ if [[ "$(whoami)" == 'root' ]]; then
     if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
         # Loading Apache2 ENV variables
         . /etc/apache2/envvars
+        install -d /var/run/apache2/
         rm -rf /var/run/apache2/*
     else
         rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*

docker/cloudkitty/cloudkitty-api/extend_start.sh

@@ -5,6 +5,7 @@
 if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
     # Loading Apache2 ENV variables
     . /etc/apache2/envvars
+    install -d /var/run/apache2/
     rm -rf /var/run/apache2/*
 else
     rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*

docker/crane/extend_start.sh

@@ -7,6 +7,7 @@ if [[ "$(whoami)" == 'root' ]]; then
     if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
         # Loading Apache2 ENV variables
         . /etc/apache2/envvars
+        install -d /var/run/apache2/
         rm -rf /var/run/apache2/*
     else
         rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*