From 11815cabf5774c5bb306cb4592fcbe02424fbdb9 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 25 Oct 2019 13:57:58 +0100 Subject: [PATCH 01/51] Bump OpenStack versions for Stein Change-Id: I7820452f107e036d92b282462b0911a0f0e46d82 --- kolla/common/config.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index a1e000c251..f081953bc5 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -383,7 +383,7 @@ 'horizon': { 'type': 'url', 'location': ('$tarballs_base/horizon/' - 'horizon-15.1.0.tar.gz')}, + 'horizon-15.1.1.tar.gz')}, 'horizon-plugin-blazar-dashboard': { 'type': 'url', 'location': ('$tarballs_base/blazar-dashboard/' @@ -427,7 +427,7 @@ 'horizon-plugin-manila-ui': { 'type': 'url', 'location': ('$tarballs_base/manila-ui/' - 'manila-ui-2.18.0.tar.gz')}, + 'manila-ui-2.18.1.tar.gz')}, 'horizon-plugin-mistral-dashboard': { 'type': 'url', 'location': ('$tarballs_base/mistral-dashboard/' @@ -455,7 +455,7 @@ 'horizon-plugin-sahara-dashboard': { 'type': 'url', 'location': ('$tarballs_base/sahara-dashboard/' - 'sahara-dashboard-10.0.0.tar.gz')}, + 'sahara-dashboard-10.0.1.tar.gz')}, 'horizon-plugin-searchlight-ui': { 'type': 'url', 'location': ('$tarballs_base/searchlight-ui/' @@ -572,7 +572,7 @@ 'neutron-base': { 'type': 'url', 'location': ('$tarballs_base/neutron/' - 'neutron-14.0.2.tar.gz')}, + 'neutron-14.0.3.tar.gz')}, 'neutron-base-plugin-neutron-fwaas': { 'type': 'url', 'location': ('$tarballs_base/neutron-fwaas/' @@ -656,7 +656,7 @@ 'nova-base': { 'type': 'url', 'location': ('$tarballs_base/nova/' - 'nova-19.0.2.tar.gz')}, + 'nova-19.0.3.tar.gz')}, 'nova-base-plugin-blazar': { 'type': 'url', 'location': ('$tarballs_base/blazar-nova/' @@ -776,7 +776,7 @@ 'sahara-base': { 'type': 'url', 'location': ('$tarballs_base/sahara/' - 'sahara-10.0.0.tar.gz')}, + 'sahara-10.0.1.tar.gz')}, 'sahara-base-plugin-ambari': { 'type': 'url', 'location': ('$tarballs_base/sahara-plugin-ambari/' @@ -784,11 +784,11 @@ 'sahara-base-plugin-cdh': { 'type': 'url', 'location': ('$tarballs_base/sahara-plugin-cdh/' - 'sahara-plugin-cdh-1.0.0.tar.gz')}, + 'sahara-plugin-cdh-1.0.1.tar.gz')}, 'sahara-base-plugin-mapr': { 'type': 'url', 'location': ('$tarballs_base/sahara-plugin-mapr/' - 'sahara-plugin-mapr-1.0.0.tar.gz')}, + 'sahara-plugin-mapr-1.0.1.tar.gz')}, 'sahara-base-plugin-spark': { 'type': 'url', 'location': ('$tarballs_base/sahara-plugin-spark/' From 23e488dfe73a9273698f2a33d8b74f770d9a83f6 Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Wed, 30 Oct 2019 09:43:23 +0100 Subject: [PATCH 02/51] Add xfsprogs to nova-compute xfsprogs is required for formatting XFS ephemeral disk partitions when format=xfs is specified as instance create failes with 'mkfs.xfs: No such file or directory' due to missing xfsprogs package in the nova-compute container. Closes-Bug: #1850610 Change-Id: Iaf3414464f3dd747427247339c6b201b352063cb (cherry picked from commit 9b1a243a3a1669532f25bbdcbc56b78f0f72882c) --- docker/nova/nova-compute/Dockerfile.j2 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 8e76278c1a..e4e2176978 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -20,7 +20,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openvswitch', 'parted', 'sysfsutils', - 'targetcli' + 'targetcli', + 'xfsprogs' ] %} {% if distro_python_version.startswith('3') %} @@ -61,7 +62,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-rbd', 'python3-rtslib-fb', 'sysfsutils', - 'targetcli-fb' + 'targetcli-fb', + 'xfsprogs' ] %} {{ macros.install_packages(nova_compute_packages | customizable("packages")) }} @@ -88,7 +90,8 @@ RUN rm -f /etc/nova/nova-compute.conf 'python-rtslib', 'qemu-img-ev', 'sysfsutils', - 'targetcli' + 'targetcli', + 'xfsprogs' ] %} {% elif base_package_type == 'deb' %} @@ -107,7 +110,8 @@ RUN rm -f /etc/nova/nova-compute.conf 'python-libvirt', 'python-rtslib-fb', 'qemu-utils', - 'targetcli-fb' + 'targetcli-fb', + 'xfsprogs' ] %} {% if base_arch == "aarch64" %} From 8e712fadd3d7e12163455a74a8076791d925de11 Mon Sep 17 00:00:00 2001 From: Scott Solkhon Date: Fri, 16 Aug 2019 16:10:33 +0000 Subject: [PATCH 03/51] Add effective and permitted capability to blackbox exporter The ICMP probe in the Prometheus blackbox exporter requires elevated privileges to function. Linux root user or CAP_NET_RAW capability is required. Can be set by executing setcap cap_net_raw+ep blackbox_exporter. This change also bumps the version of the blackbox exporter to the next minor version to allow for this support. '+ep' means we're adding the capability as effective and permitted. See: https://github.com/prometheus/blackbox_exporter Change-Id: I1c3b817712ae10edd45de01382b044af2fb728bd Closes-Bug: #1840631 Co-authored-by: Jack Heskett (cherry picked from commit b5a4478b0fa9b775a9b5c45545e78e9215a50588) --- .../prometheus-blackbox-exporter/Dockerfile.j2 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 index 56552a3184..90b5fa46a5 100644 --- a/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 @@ -3,15 +3,30 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block prometheus_blackbox_exporter_header %}{% endblock %} +{% import "macros.j2" as macros with context %} + {% block prometheus_blackbox_exporter_repository_version %} -ENV blackbox_exporter_version=0.13.0 +ENV blackbox_exporter_version=0.14.0 {% endblock %} +{% if base_package_type == 'rpm' %} + {% set blackbox_packages = [ + 'libcap' + ] %} +{% elif base_package_type == 'deb' %} + {% set blackbox_packages = [ + 'libcap2-bin' + ] %} +{% endif %} + +{{ macros.install_packages(blackbox_packages | customizable("packages")) }} + {% block prometheus_blackbox_exporter_install %} RUN curl -sSL -o /tmp/blackbox_exporter.tar.gz https://github.com/prometheus/blackbox_exporter/releases/download/v${blackbox_exporter_version}/blackbox_exporter-${blackbox_exporter_version}.linux-{{debian_arch}}.tar.gz \ && tar xvf /tmp/blackbox_exporter.tar.gz -C /opt/ \ && rm -f /tmp/blackbox_exporter.tar.gz \ && ln -s /opt/blackbox_exporter* /opt/blackbox_exporter +RUN setcap cap_net_raw+ep /opt/blackbox_exporter/blackbox_exporter {% endblock %} {% block prometheus_blackbox_exporter_footer %}{% endblock %} From 0f320e34ea3e5f1b8dcc188a082071be7a49c1d0 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 17 Oct 2019 03:36:17 -0700 Subject: [PATCH 04/51] get 'apt_*' options of kolla-build.conf working again We broke 'apt_sources_list' and 'apt_preferences' options quite a while ago. Turned out that fix is quite simple. This change adds empty sources.list and apt-preferences files which are always added into images. If kolla-build.conf will use any of APT related options then those files will be replaced with provided ones. Change-Id: I7bbdcbd5c60f654a484a872209e0537e3950346c Closes-bug: #1706549 (cherry picked from commit bf20b41e7dea702b693fa98ea27822c8a33a5591) --- docker/base/Dockerfile.j2 | 2 ++ docker/base/apt_preferences | 1 + docker/base/sources.list | 1 + 3 files changed, 4 insertions(+) create mode 100644 docker/base/apt_preferences create mode 100644 docker/base/sources.list diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index ebe7a3ae2c..1f6356d1c0 100644 --- a/docker/base/Dockerfile.j2 +++ b/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 = [ diff --git a/docker/base/apt_preferences b/docker/base/apt_preferences new file mode 100644 index 0000000000..dc5b993f17 --- /dev/null +++ b/docker/base/apt_preferences @@ -0,0 +1 @@ +# used for adding custom options by 'apt_preferences' option of kolla-build.conf diff --git a/docker/base/sources.list b/docker/base/sources.list new file mode 100644 index 0000000000..1acbbcb59c --- /dev/null +++ b/docker/base/sources.list @@ -0,0 +1 @@ +# used for adding custom repos by 'apt_sources_list' option of kolla-build.conf From 25890a485b20f9530f769c23af841d6a50593b37 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 12 Sep 2019 11:48:07 +0200 Subject: [PATCH 05/51] Stein: support mariabackup for backups This is a combination of 3 commits from Train. Rather than dropping xtrabackup, we are keeping it in addition to adding support for backups using mariabackup. 1. Drop Percona XtraBackup in favour of MariaDB Backup XtraBackup started failing to install on Ubuntu and does not support MariaDB 10.3 version. Related-Bug: #1843043 I9cf62c8e03a02574d85e5349df1d23a51d4c99be 2. Fix mariabackup arguments After switching from innobackupex to mariabackup [1] for database backups, the kolla_mariadb_backup.sh script was not modified to account for the difference in arguments between innobackupex and mariabackup. There is a compatibility mode, the documentation [2] for which covers some of the differences. The following have been changed: - Add explicit --backup argument, now required - Remove './' positional argument - not required with --stream - Remove --no-timestamp argument - only supported in innobackupex compatibility mode - Remove --incremental argument - implied by --incremental-history-name - Remove deprecated --compress argument, which requires qpress to be installed (it is not). The stream is now passed through gzip instead [3] [1] https://mariadb.com/kb/en/library/mariabackup-overview/ [2] https://mariadb.com/kb/en/library/mariabackup-options/#-innobackupex [3] https://mariadb.com/kb/en/library/using-encryption-and-compression-tools-with-mariabackup/ I67cff47cbf56570b8eaeb66092dd87c2769fc8a6 Closes-Bug: #1843043 (cherry picked from commit 65b27d772be32738a8508ea8e6c07f74f229cdb7) 3. Set pipefail in kolla_mariadb_backup.sh Without this, a failure in mariabackup would be ignored due to the pipe to gzip. I84536b302991e8fb04d5fa67ea266bc428437ce1 Related-Bug: #1843043 Change-Id: Idf1aed905a7d9ad461dd6fe17ed199c8d60370e6 --- docker/mariadb/Dockerfile.j2 | 3 +++ docker/mariadb/backup.sh | 48 ++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 docker/mariadb/backup.sh diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 4e2f57f489..1ee8752225 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -52,6 +52,9 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \ RUN mkdir -p /var/run/mysqld && chown mysql /var/run/mysqld && chmod 755 /var/run/mysqld {% endif %} +COPY backup.sh /usr/local/bin/kolla_mariadb_backup.sh +RUN chmod 755 /usr/local/bin/kolla_mariadb_backup.sh + {% if use_dumb_init %} {% block mariadb_entrypoint %} # NOTE(mgoddard): Override the dumb-init arguments to avoid passing diff --git a/docker/mariadb/backup.sh b/docker/mariadb/backup.sh new file mode 100644 index 0000000000..e56450171f --- /dev/null +++ b/docker/mariadb/backup.sh @@ -0,0 +1,48 @@ +#!/usr/bin/env bash + +set -eu +set -o pipefail + +# Execute a full backup +backup_full() { + echo "Taking a full backup" + mariabackup \ + --defaults-file=/etc/mysql/my.cnf \ + --backup \ + --stream=xbstream \ + --history=$(date +%d-%m-%Y) | gzip > \ + $BACKUP_DIR/mysqlbackup-$(date +%d-%m-%Y-%s).qp.xbc.xbs.gz +} + +# Execute an incremental backup +backup_incremental() { + echo "Taking an incremental backup" + mariabackup \ + --defaults-file=/etc/mysql/my.cnf \ + --backup \ + --stream=xbstream \ + --incremental-history-name=$(date +%d-%m-%Y) \ + --history=$(date +%d-%m-%Y) | gzip > \ + $BACKUP_DIR/incremental-$(date +%H)-mysqlbackup-$(date +%d-%m-%Y-%s).qp.xbc.xbs.gz +} + +BACKUP_DIR=/backup/ +cd $BACKUP_DIR + +if [ -n $BACKUP_TYPE ]; then + case $BACKUP_TYPE in + "full") + backup_full + ;; + "incremental") + backup_incremental + ;; + *) + echo "Only full or incremental options are supported." + exit 1 + ;; + esac +else + echo "You need to specify either full or incremental backup options." + exit 1 +fi From eedc78092fcd4033d30baf68ce985421f7091fb4 Mon Sep 17 00:00:00 2001 From: Dincer Celik Date: Thu, 7 Nov 2019 21:02:53 +0300 Subject: [PATCH 06/51] [manila] Fixes manila-share on debian/ubuntu manila-share cannot start on debian/ubuntu because python3-cephfs is missing. Change-Id: Ia592dda4ee20979c701efe6007f236dba9848997 Closes-Bug: #1851692 (cherry picked from commit 1d5a208c2e5c81ed4169c63d1d5ea0ad31b78f2f) --- docker/manila/manila-share/Dockerfile.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2 index bdd08fb658..80acab15c3 100644 --- a/docker/manila/manila-share/Dockerfile.j2 +++ b/docker/manila/manila-share/Dockerfile.j2 @@ -17,6 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set manila_share_packages = [ 'manila-share', 'ceph-common', + 'python3-cephfs', 'python3-rados', 'python3-rbd', 'sqlite3' From 8673f02844a4a43e6eeb74d6437c2d97b530802a Mon Sep 17 00:00:00 2001 From: Martin Chlumsky Date: Mon, 4 Nov 2019 13:46:49 -0500 Subject: [PATCH 07/51] swift-rsyncd: don't recursively chown /srv/node at startup Instead of doing a recursive chown on /srv/node, chown only /srv/node and any immediate subdirectory under /srv/node. Change-Id: I8fd93fa77ba9fc63910360300b8783a34bd4e6d5 Closes-Bug: #1851169 (cherry picked from commit 2d122afaf9817cadc668b308c4f736e47c09a55f) --- docker/swift/swift-base/swift_sudoers | 4 ++-- docker/swift/swift-rsyncd/extend_start.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/swift/swift-base/swift_sudoers b/docker/swift/swift-base/swift_sudoers index b67c47df31..752fe0e2ee 100644 --- a/docker/swift/swift-base/swift_sudoers +++ b/docker/swift/swift-base/swift_sudoers @@ -1,3 +1,3 @@ -swift ALL=(root) NOPASSWD: /bin/chown -R swift\:swift /srv/node -swift ALL=(root) NOPASSWD: /usr/bin/chown -R swift\:swift /srv/node +swift ALL=(root) NOPASSWD: /bin/find /srv/node/ -maxdepth 1 -type d -execdir chown swift\:swift {} \\+ +swift ALL=(root) NOPASSWD: /usr/bin/find /srv/node/ -maxdepth 1 -type d -execdir chown swift\:swift {} \\+ swift ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/swift-rootwrap /etc/swift/rootwrap.conf * diff --git a/docker/swift/swift-rsyncd/extend_start.sh b/docker/swift/swift-rsyncd/extend_start.sh index 86d24724bc..33ff2bf2cf 100644 --- a/docker/swift/swift-rsyncd/extend_start.sh +++ b/docker/swift/swift-rsyncd/extend_start.sh @@ -1,4 +1,4 @@ #!/bin/bash -sudo chown -R swift:swift /srv/node +sudo find /srv/node/ -maxdepth 1 -type d -execdir chown swift:swift {} \+ mkdir -p /var/lib/swift/lock From b843a1eb18e5fcbef41656288b313a8e24dbfb0d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 29 Nov 2019 15:48:00 +0100 Subject: [PATCH 08/51] Bump OpenStack versions for Stein Change-Id: Ia1f17f3bffbd59ad99e46ddd100b88617737f29c --- kolla/common/config.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index f081953bc5..2057959a75 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -431,7 +431,7 @@ 'horizon-plugin-mistral-dashboard': { 'type': 'url', 'location': ('$tarballs_base/mistral-dashboard/' - 'mistral-dashboard-8.0.0.tar.gz')}, + 'mistral-dashboard-8.1.0.tar.gz')}, 'horizon-plugin-monasca-ui': { 'type': 'url', 'location': ('$tarballs_base/monasca-ui/' @@ -495,7 +495,7 @@ 'ironic-base': { 'type': 'url', 'location': ('$tarballs_base/ironic/' - 'ironic-12.1.2.tar.gz')}, + 'ironic-12.1.3.tar.gz')}, 'ironic-inspector': { 'type': 'url', 'location': ('$tarballs_base/ironic-inspector/' @@ -523,11 +523,11 @@ 'manila-base': { 'type': 'url', 'location': ('$tarballs_base/manila/' - 'manila-8.0.1.tar.gz')}, + 'manila-8.1.0.tar.gz')}, 'mistral-base': { 'type': 'url', 'location': ('$tarballs_base/mistral/' - 'mistral-8.0.0.tar.gz')}, + 'mistral-8.1.0.tar.gz')}, 'mistral-base-plugin-tacker': { 'type': 'url', 'location': ('$tarballs_base/tacker/' @@ -608,7 +608,7 @@ 'neutron-lbaas-agent': { 'type': 'url', 'location': ('$tarballs_base/neutron-lbaas/' - 'neutron-lbaas-14.0.0.tar.gz')}, + 'neutron-lbaas-14.0.1.tar.gz')}, 'neutron-server-opendaylight-plugin-networking-odl': { 'type': 'url', 'location': ('$tarballs_base/networking-odl/' @@ -636,7 +636,7 @@ 'neutron-server-plugin-neutron-lbaas': { 'type': 'url', 'location': ('$tarballs_base/neutron-lbaas/' - 'neutron-lbaas-14.0.0.tar.gz')}, + 'neutron-lbaas-14.0.1.tar.gz')}, 'neutron-server-plugin-vmware-nsxlib': { 'type': 'url', 'location': ('$tarballs_base/vmware-nsxlib/' @@ -816,7 +816,7 @@ 'swift-base': { 'type': 'url', 'location': ('$tarballs_base/swift/' - 'swift-2.21.0.tar.gz')}, + 'swift-2.21.1.tar.gz')}, 'tacker-base': { 'type': 'url', 'location': ('$tarballs_base/tacker/' From 38191924fe0400415a1d20a17529a9e1003a30de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Tue, 3 Dec 2019 14:28:26 +0100 Subject: [PATCH 09/51] Install etcd3gw to fix Ubuntu binary tooz coordination Change-Id: Ib56e62d1fb4d0fc4a6c627b87a929be0bc614d1e Closes-bug: #1852086 (cherry picked from commit 0186c5e3cafeae0bb1c39bdef0df6ade827552d5) --- docker/openstack-base/Dockerfile.j2 | 1 + .../add-etcd3gw-to-ubuntu-binary-1aaf4b5e1ee670ee.yaml | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 releasenotes/notes/add-etcd3gw-to-ubuntu-binary-1aaf4b5e1ee670ee.yaml diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 89995061e5..20659608f5 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -190,6 +190,7 @@ ENV DEBIAN_FRONTEND noninteractive 'python3-designateclient', 'python3-elasticsearch', 'python3-etcd', + 'python3-etcd3gw', 'python3-gnocchiclient', 'python3-heatclient', 'python3-ironicclient', diff --git a/releasenotes/notes/add-etcd3gw-to-ubuntu-binary-1aaf4b5e1ee670ee.yaml b/releasenotes/notes/add-etcd3gw-to-ubuntu-binary-1aaf4b5e1ee670ee.yaml new file mode 100644 index 0000000000..a56fd9400f --- /dev/null +++ b/releasenotes/notes/add-etcd3gw-to-ubuntu-binary-1aaf4b5e1ee670ee.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes unavailability of an etcd3-compatible tooz coordination driver in + Ubuntu binary images by installing ``python3-etcd3gw``. See `bug 1852086 + `__ for details. From 7934cf7d4a18e90be38cb4c40f39b1dfd4f49a54 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 9 Dec 2019 11:11:26 +0000 Subject: [PATCH 10/51] Fix keystone bootstrap error message display In some situations, Keystone bootstrap can fail, and then unhelpfully fails displaying the error message output by the 'keystone-manage bootstrap' command. This appears to be due to unprintable control characters in the error message which prevent the output of the script from being valid JSON. This change fixes the issue by piping the output through 'cat -v', which replaces unprintable characters with control codes. Change-Id: I82444bc2272311023cc9e92c5a298d1c4c87483b Closes-Bug: #1855701 (cherry picked from commit bcca3fabe305c1e206fdb231c31809ceff2d4774) --- docker/keystone/keystone/keystone_bootstrap.sh | 6 +++++- ...fix-keystone-bootstrap-unprintable-e01b088ef821fd18.yaml | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix-keystone-bootstrap-unprintable-e01b088ef821fd18.yaml diff --git a/docker/keystone/keystone/keystone_bootstrap.sh b/docker/keystone/keystone/keystone_bootstrap.sh index c140e97c73..e37e383526 100644 --- a/docker/keystone/keystone/keystone_bootstrap.sh +++ b/docker/keystone/keystone/keystone_bootstrap.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -o pipefail + # NOTE(SamYaple): Kolla needs to wraps `keystone-manage bootstrap` to ensure # any change is reported correctly for idempotency. This script will exit with # valid json that can be parsed with information about if the task has failed @@ -29,7 +31,9 @@ function exit_json { } changed="false" -keystone_bootstrap=$(keystone-manage bootstrap --bootstrap-username "${USERNAME}" --bootstrap-password "${PASSWORD}" --bootstrap-project-name "${PROJECT}" --bootstrap-role-name "${ROLE}" --bootstrap-admin-url "${ADMIN_URL}" --bootstrap-internal-url "${INTERNAL_URL}" --bootstrap-public-url "${PUBLIC_URL}" --bootstrap-service-name "keystone" --bootstrap-region-id "${REGION}" 2>&1) +# NOTE(mgoddard): pipe through cat -v to remove unprintable control characters +# which prevent JSON decoding. +keystone_bootstrap=$(keystone-manage bootstrap --bootstrap-username "${USERNAME}" --bootstrap-password "${PASSWORD}" --bootstrap-project-name "${PROJECT}" --bootstrap-role-name "${ROLE}" --bootstrap-admin-url "${ADMIN_URL}" --bootstrap-internal-url "${INTERNAL_URL}" --bootstrap-public-url "${PUBLIC_URL}" --bootstrap-service-name "keystone" --bootstrap-region-id "${REGION}" 2>&1 | cat -v) if [[ $? != 0 ]]; then fail_json "${keystone_bootstrap}" fi diff --git a/releasenotes/notes/fix-keystone-bootstrap-unprintable-e01b088ef821fd18.yaml b/releasenotes/notes/fix-keystone-bootstrap-unprintable-e01b088ef821fd18.yaml new file mode 100644 index 0000000000..885e0e7606 --- /dev/null +++ b/releasenotes/notes/fix-keystone-bootstrap-unprintable-e01b088ef821fd18.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes an issue with keystone bootstrap where an error message emitted by + the ``keystone-manage bootstrap`` command is hidden. See `bug 1855701 + `__ for details. From acbc6e0eb95868adf58f1916669ecd850d049758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Tue, 17 Dec 2019 12:57:49 +0100 Subject: [PATCH 11/51] Fix monasca-grafana being unbuildable due to old npm Affected builds on Ubuntu which had: npm 3.5.2 while the latest was: npm 6.13.4 And CentOS had: npm 5.6.0 This patch runs npm update via npm. Pinned to 6.x. Additionally, this moves npm packages prefix (root) to /usr/local to avoid conflicts with native packages. Change-Id: Ibaacc1cc478b2b2f8196a5da4eea3570d7d310ff Closes-bug: #1856699 (cherry picked from commit 308e85aa413da84ed107b27fa09a3f0e0a64392f) --- docker/monasca/monasca-grafana/Dockerfile.j2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2 index 3e37a16878..295f37ae2f 100644 --- a/docker/monasca/monasca-grafana/Dockerfile.j2 +++ b/docker/monasca/monasca-grafana/Dockerfile.j2 @@ -50,6 +50,9 @@ ARG monasca_grafana_url=https://github.com/monasca/grafana/archive/$monasca_graf {% block monasca_grafana_install %} # NOTE(mgoddard): Pinning rake because rake 13.0.0 depends on Ruby 2.2, and CentOS 7 only provides # Ruby 2.0. +# NOTE(yoctozepto): Update npm to 6.x version to avoid issues with metadata parsing. +# NPM installs itself in /usr/local/bin (the default in Ubuntu) which is not in the PATH. +# This is forced for all distros to avoid conflicts with native packages. RUN gem install rake:"~>12" fpm \ && curl -sSL -o /tmp/monasca-grafana.tgz ${monasca_grafana_url} \ && mkdir -p ${monasca_grafana_build_path} \ @@ -57,7 +60,9 @@ RUN gem install rake:"~>12" fpm \ && rm -f /tmp/monasca-grafana.tgz \ && cd ${monasca_grafana_build_path} \ && go run build.go setup \ - && npm install \ + && npm config set prefix /usr/local -g \ + && npm install npm@6.x -g \ + && /usr/local/bin/npm install \ && go run build.go build package \ && mv ${monasca_grafana_build_path}/dist /grafana_pkgs \ && rm -rf /grafana From a7b0f25d4b21e013032c92e3160697f8d996480c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 19 Dec 2019 09:59:31 +0100 Subject: [PATCH 12/51] Bump versions for Openstack stein Change-Id: I88ebd3db3bf2be0db1c9082b050fe5788d3a7239 --- kolla/common/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index 2057959a75..e9eeed2fec 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -519,7 +519,7 @@ 'magnum-base': { 'type': 'url', 'location': ('$tarballs_base/magnum/' - 'magnum-8.1.0.tar.gz')}, + 'magnum-8.2.0.tar.gz')}, 'manila-base': { 'type': 'url', 'location': ('$tarballs_base/manila/' @@ -672,7 +672,7 @@ 'octavia-base': { 'type': 'url', 'location': ('$tarballs_base/octavia/' - 'octavia-4.1.0.tar.gz')}, + 'octavia-4.1.1.tar.gz')}, 'panko-base': { 'type': 'url', 'location': ('$tarballs_base/panko/' From 56772b04eaeb901cc3e796974a79a512cfa4cbce Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 20 Dec 2019 15:54:53 +0100 Subject: [PATCH 13/51] Bump OpenStack versions for Stein Change-Id: I6f6b32e3858f793a4674967e3fa3fcec87d93e6e --- kolla/common/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index e9eeed2fec..ba67178a35 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -572,7 +572,7 @@ 'neutron-base': { 'type': 'url', 'location': ('$tarballs_base/neutron/' - 'neutron-14.0.3.tar.gz')}, + 'neutron-14.0.4.tar.gz')}, 'neutron-base-plugin-neutron-fwaas': { 'type': 'url', 'location': ('$tarballs_base/neutron-fwaas/' From 7d9cd19673e9520c181cbe4d7b83387a43a464c4 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 28 May 2019 12:01:45 +0200 Subject: [PATCH 14/51] create missing apache2 directory on Debian/Ubuntu Ubuntu/source deployment of several images (horizon, placement-api, zun) failed with: + exec /usr/sbin/apache2 -DFOREGROUND apache2: Syntax error on line 80 of /etc/apache2/apache2.conf: DefaultRuntimeDir must be a valid directory, absolute or relative to ServerRoot Change-Id: Ie2a1077f7def0743f1403341985e2109aa490026 (cherry picked from commit 932f09bcd65e15524b5229fdb6bc73a7e0111b27) --- docker/aodh/aodh-api/extend_start.sh | 1 + docker/barbican/barbican-api/extend_start.sh | 1 + docker/cinder/cinder-api/extend_start.sh | 1 + docker/cloudkitty/cloudkitty-api/extend_start.sh | 1 + docker/crane/extend_start.sh | 1 + docker/cyborg/cyborg-api/extend_start.sh | 1 + docker/freezer/freezer-api/extend_start.sh | 1 + docker/gnocchi/gnocchi-api/extend_start.sh | 1 + docker/heat/heat-base/extend_start.sh | 1 + docker/ironic/ironic-api/extend_start.sh | 1 + docker/ironic/ironic-pxe/extend_start.sh | 1 + docker/keystone/keystone/extend_start.sh | 1 + docker/manila/manila-api/extend_start.sh | 1 + docker/mistral/mistral-api/extend_start.sh | 1 + docker/monasca/monasca-api/extend_start.sh | 1 + docker/monasca/monasca-log-api/extend_start.sh | 1 + docker/nova/nova-api/extend_start.sh | 1 + docker/octavia/octavia-api/extend_start.sh | 1 + docker/panko/panko-api/extend_start.sh | 1 + docker/tripleo-ui/extend_start.sh | 1 + docker/vitrage/vitrage-api/extend_start.sh | 1 + docker/zaqar/zaqar-wsgi/extend_start.sh | 1 + docker/zun/zun-api/extend_start.sh | 1 + 23 files changed, 23 insertions(+) diff --git a/docker/aodh/aodh-api/extend_start.sh b/docker/aodh/aodh-api/extend_start.sh index 0826a46452..708b12ed32 100644 --- a/docker/aodh/aodh-api/extend_start.sh +++ b/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* diff --git a/docker/barbican/barbican-api/extend_start.sh b/docker/barbican/barbican-api/extend_start.sh index 687c66ddb9..920b508041 100755 --- a/docker/barbican/barbican-api/extend_start.sh +++ b/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* diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh index 7fef2609bd..251b9d1059 100644 --- a/docker/cinder/cinder-api/extend_start.sh +++ b/docker/cinder/cinder-api/extend_start.sh @@ -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* diff --git a/docker/cloudkitty/cloudkitty-api/extend_start.sh b/docker/cloudkitty/cloudkitty-api/extend_start.sh index 756fd82fd0..e1f41b5587 100644 --- a/docker/cloudkitty/cloudkitty-api/extend_start.sh +++ b/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* diff --git a/docker/crane/extend_start.sh b/docker/crane/extend_start.sh index ada839e961..1277bea352 100644 --- a/docker/crane/extend_start.sh +++ b/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* diff --git a/docker/cyborg/cyborg-api/extend_start.sh b/docker/cyborg/cyborg-api/extend_start.sh index a96619d932..1cc72590f3 100644 --- a/docker/cyborg/cyborg-api/extend_start.sh +++ b/docker/cyborg/cyborg-api/extend_start.sh @@ -10,6 +10,7 @@ fi 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* diff --git a/docker/freezer/freezer-api/extend_start.sh b/docker/freezer/freezer-api/extend_start.sh index 9ce14e5044..c6c0960620 100755 --- a/docker/freezer/freezer-api/extend_start.sh +++ b/docker/freezer/freezer-api/extend_start.sh @@ -10,6 +10,7 @@ fi 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* diff --git a/docker/gnocchi/gnocchi-api/extend_start.sh b/docker/gnocchi/gnocchi-api/extend_start.sh index e67dff0dff..5059551d2e 100644 --- a/docker/gnocchi/gnocchi-api/extend_start.sh +++ b/docker/gnocchi/gnocchi-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* diff --git a/docker/heat/heat-base/extend_start.sh b/docker/heat/heat-base/extend_start.sh index ae72de96b1..5af0ef36d4 100644 --- a/docker/heat/heat-base/extend_start.sh +++ b/docker/heat/heat-base/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* diff --git a/docker/ironic/ironic-api/extend_start.sh b/docker/ironic/ironic-api/extend_start.sh index ebe85b893b..20811158c8 100644 --- a/docker/ironic/ironic-api/extend_start.sh +++ b/docker/ironic/ironic-api/extend_start.sh @@ -25,6 +25,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* diff --git a/docker/ironic/ironic-pxe/extend_start.sh b/docker/ironic/ironic-pxe/extend_start.sh index 0ba57a834a..6d0234c1c2 100644 --- a/docker/ironic/ironic-pxe/extend_start.sh +++ b/docker/ironic/ironic-pxe/extend_start.sh @@ -45,6 +45,7 @@ fi 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* diff --git a/docker/keystone/keystone/extend_start.sh b/docker/keystone/keystone/extend_start.sh index 0d8d3bc43f..be6a0e1def 100644 --- a/docker/keystone/keystone/extend_start.sh +++ b/docker/keystone/keystone/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* diff --git a/docker/manila/manila-api/extend_start.sh b/docker/manila/manila-api/extend_start.sh index 3e5347ac5b..ea4a64f5f3 100644 --- a/docker/manila/manila-api/extend_start.sh +++ b/docker/manila/manila-api/extend_start.sh @@ -15,6 +15,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* diff --git a/docker/mistral/mistral-api/extend_start.sh b/docker/mistral/mistral-api/extend_start.sh index 4953802b19..65e9db22cd 100644 --- a/docker/mistral/mistral-api/extend_start.sh +++ b/docker/mistral/mistral-api/extend_start.sh @@ -15,6 +15,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* diff --git a/docker/monasca/monasca-api/extend_start.sh b/docker/monasca/monasca-api/extend_start.sh index 5ea66ca4c0..f52868035c 100644 --- a/docker/monasca/monasca-api/extend_start.sh +++ b/docker/monasca/monasca-api/extend_start.sh @@ -14,6 +14,7 @@ fi 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* diff --git a/docker/monasca/monasca-log-api/extend_start.sh b/docker/monasca/monasca-log-api/extend_start.sh index bcccdf1749..d343ab26a1 100644 --- a/docker/monasca/monasca-log-api/extend_start.sh +++ b/docker/monasca/monasca-log-api/extend_start.sh @@ -7,6 +7,7 @@ SERVICE="monasca-log-api" 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* diff --git a/docker/nova/nova-api/extend_start.sh b/docker/nova/nova-api/extend_start.sh index 428d8945a0..3d958253e0 100644 --- a/docker/nova/nova-api/extend_start.sh +++ b/docker/nova/nova-api/extend_start.sh @@ -27,6 +27,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* diff --git a/docker/octavia/octavia-api/extend_start.sh b/docker/octavia/octavia-api/extend_start.sh index 48a6751cb1..d6cacba528 100644 --- a/docker/octavia/octavia-api/extend_start.sh +++ b/docker/octavia/octavia-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* diff --git a/docker/panko/panko-api/extend_start.sh b/docker/panko/panko-api/extend_start.sh index 423a8e2b85..6cfb322eb1 100644 --- a/docker/panko/panko-api/extend_start.sh +++ b/docker/panko/panko-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* diff --git a/docker/tripleo-ui/extend_start.sh b/docker/tripleo-ui/extend_start.sh index ada839e961..1277bea352 100644 --- a/docker/tripleo-ui/extend_start.sh +++ b/docker/tripleo-ui/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* diff --git a/docker/vitrage/vitrage-api/extend_start.sh b/docker/vitrage/vitrage-api/extend_start.sh index 3504f6ab20..0a6204ea55 100644 --- a/docker/vitrage/vitrage-api/extend_start.sh +++ b/docker/vitrage/vitrage-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* diff --git a/docker/zaqar/zaqar-wsgi/extend_start.sh b/docker/zaqar/zaqar-wsgi/extend_start.sh index ada839e961..1277bea352 100755 --- a/docker/zaqar/zaqar-wsgi/extend_start.sh +++ b/docker/zaqar/zaqar-wsgi/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* diff --git a/docker/zun/zun-api/extend_start.sh b/docker/zun/zun-api/extend_start.sh index 92f6690648..6136e6b24a 100644 --- a/docker/zun/zun-api/extend_start.sh +++ b/docker/zun/zun-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* From 54c98dc29d2764c099227b4d900e5b429e09368e Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 7 Jan 2020 11:15:07 +0100 Subject: [PATCH 15/51] horizon: fix build in stable branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When [1] was committed, horizon stopped building for Train. Analogous patch is proposed to other stable branches. This patch removes horizon from upper-constraints. Kolla master is affected directly because we build Train for CentOS 7 atm. [1] https://opendev.org/openstack/requirements/commit/3e54878f9c87266e1b9775f72af06de27a3dad65 Co-authored-by: Radosław Piliszek Change-Id: I1bd5a40eeef9612d995c81426fe510e89f438725 (cherry picked from commit 8b7ec43536842dd500cc5ee1198a318070ac1046) --- docker/horizon/Dockerfile.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 4c3ba13305..be788e1e36 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -143,7 +143,9 @@ ADD plugins-archive / '/plugins/*' ] %} +# NOTE(hrw): to install horizon from unpacked sources we cannot have it in upper-constraints.txt RUN ln -s horizon-source/* horizon \ + && sed -i /^horizon=/d /requirements/upper-constraints.txt \ && {{ macros.install_pip(horizon_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/openstack-dashboard \ && cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \ From 28e67a74a4b78d5460a3f0e3d5a1a4532af7de9e Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 6 Jan 2020 20:14:37 +0100 Subject: [PATCH 16/51] Bump versions for Openstack stein Change-Id: Ia1ffb7b0834ffd776d2c7ffac40757eafa51ff29 --- kolla/common/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index ba67178a35..0d89ed1a68 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -331,7 +331,7 @@ 'cinder-base': { 'type': 'url', 'location': ('$tarballs_base/cinder/' - 'cinder-14.0.2.tar.gz')}, + 'cinder-14.0.3.tar.gz')}, 'congress-base': { 'type': 'url', 'location': ('$tarballs_base/congress/' From 121f294cfff94032f06b1d73323f948220b68e74 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 10 Jan 2020 06:16:51 +0100 Subject: [PATCH 17/51] neutron: fix build in stable branches When [1] was committed, neutron stopped building for Train. Analogous patch is proposed to other stable branches. This patch removes neutron from upper-constraints. Kolla master is affected directly because we build Train for CentOS 7 atm. 1. https://review.opendev.org/#/c/697370/ Change-Id: I944e8e42fef1d359d767cbc6e1c13371ed753f31 --- docker/neutron/neutron-base/Dockerfile.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index ec61c797f9..022ea35061 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -137,6 +137,7 @@ ADD plugins-archive / ] %} RUN ln -s neutron-base-source/* neutron \ + && sed -i /^neutron=/d /requirements/upper-constraints.txt \ && {{ macros.install_pip(neutron_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/neutron /usr/share/neutron \ && cp -r /neutron/etc/* /etc/neutron/ \ From f2dd450e715f506b398a058edcbd8676d70e1fa4 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 9 Jan 2020 16:33:46 +0100 Subject: [PATCH 18/51] Stop gzipping logs in post As per [1] we should stop compressing the logs sent to swift in order to get them back readable via a browser. [1]: http://lists.openstack.org/pipermail/openstack-discuss/2020-January/011875.html Change-Id: I5b5f323471676317a2898875cbbf297082328fcc (cherry picked from commit f44b0b778b0d3a0bfa2f7d5cc126618c4c1e67f5) --- tests/playbooks/post.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/playbooks/post.yml b/tests/playbooks/post.yml index 00f71f6b9b..1aad58a956 100644 --- a/tests/playbooks/post.yml +++ b/tests/playbooks/post.yml @@ -80,9 +80,5 @@ # append .txt to all kolla config file find kolla_configs -type f -exec mv '{}' '{}'.txt \; - - # Compress all text logs - find . -iname '*.txt' -execdir gzip -9 {} \+ - find . -iname '*.json' -execdir gzip -9 {} \+ executable: /bin/bash chdir: "{{ kolla_logs_dir }}" From f6ad36b5fe56ec2d80e703751ae641b02d98b99b Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 10 Jan 2020 09:37:09 +0000 Subject: [PATCH 19/51] CI: Fix symlinks for failed build logs Follow up to I5b5f323471676317a2898875cbbf297082328fcc. Logs are no longer gzipped, so we do not need to modify the 000_FAILED_* symlinks. Change-Id: I5df42ac0ff91b1b97537a4fbc33fc7970f29d60e (cherry picked from commit 63f773f569c7601deab40b32bd62ccde513fa46f) --- tests/playbooks/post.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/playbooks/post.yml b/tests/playbooks/post.yml index 1aad58a956..f423a70561 100644 --- a/tests/playbooks/post.yml +++ b/tests/playbooks/post.yml @@ -72,12 +72,6 @@ mv $f ${f/.log/.txt} done - # Update symlinks to new file names - for f in $(find . -name "*FAILED*"); do - mv ${f} ${f}.gz - ln -sf ${f#*/000_FAILED_}.gz ${f}.gz - done - # append .txt to all kolla config file find kolla_configs -type f -exec mv '{}' '{}'.txt \; executable: /bin/bash From 0b9485c6f3578a277910c6be6c2963c427f13613 Mon Sep 17 00:00:00 2001 From: Dincer Celik Date: Mon, 13 Jan 2020 03:36:40 +0300 Subject: [PATCH 20/51] Fixes rally db commands 'rally-manage db' command was deprecated since 0.10.0 [1]. Should use 'rally db' instead. [1] https://rally.readthedocs.io/en/latest/project_info/release_notes/archive/v0.10.0.html#command-line-interface Closes-Bug: #1856693 Change-Id: I578f7a6d907d5579180bc64c99c7e6c8edf3afc8 (cherry picked from commit 1114859b5cb940290f405cd64e34c6638dcebcae) --- docker/rally/extend_start.sh | 2 +- releasenotes/notes/rally-manage-fix-8c98a0beb6dae50e.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/rally-manage-fix-8c98a0beb6dae50e.yaml diff --git a/docker/rally/extend_start.sh b/docker/rally/extend_start.sh index e490d8b884..88f3d054f5 100644 --- a/docker/rally/extend_start.sh +++ b/docker/rally/extend_start.sh @@ -10,6 +10,6 @@ fi # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - rally-manage db create || rally-manage db upgrade + rally db create || rally db upgrade exit 0 fi diff --git a/releasenotes/notes/rally-manage-fix-8c98a0beb6dae50e.yaml b/releasenotes/notes/rally-manage-fix-8c98a0beb6dae50e.yaml new file mode 100644 index 0000000000..fb3def424f --- /dev/null +++ b/releasenotes/notes/rally-manage-fix-8c98a0beb6dae50e.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Converts deprecated command ``rally-manage db`` to ``rally db``. + `LP#1856693 `__ From 8bc3b193642b68c7070a32f6887dfb070c451011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Mon, 20 Jan 2020 10:45:12 +0100 Subject: [PATCH 21/51] [stein] Bump versions and pin vmware-nsx For some reason vmware-nsx releases outside openstack/releases keeping the neutron version in sync. Somehow we missed the pin in stein (it is pinned in rocky and train). Change-Id: Iacd75261d14dc7d9fe89d0db7502831976a6b894 --- kolla/common/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index 0d89ed1a68..ec7dfe7633 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -576,7 +576,7 @@ 'neutron-base-plugin-neutron-fwaas': { 'type': 'url', 'location': ('$tarballs_base/neutron-fwaas/' - 'neutron-fwaas-14.0.0.tar.gz')}, + 'neutron-fwaas-14.0.1.tar.gz')}, 'neutron-base-plugin-networking-ansible': { 'type': 'url', 'location': ('$tarballs_base/networking-ansible/' @@ -596,7 +596,7 @@ 'neutron-base-plugin-vmware-nsx': { 'type': 'url', 'location': ('$tarballs_base/vmware-nsx/' - 'vmware-nsx-master.tar.gz')}, + 'vmware-nsx-14.0.0.tar.gz')}, 'neutron-base-plugin-vpnaas-agent': { 'type': 'url', 'location': ('$tarballs_base/neutron-vpnaas/' From 45497837cdb1e239b3a7a69db632aa3b8b6b4224 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 10 Jan 2020 13:19:00 +0100 Subject: [PATCH 22/51] config: make kolla work with oslo.config 7.0.0+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From oslo.config 7.0.0 release notes: > Positional options are now required by default, to match argparse’s > default behavior. To revert this behavior (and maintain optional > positional arguments), you need to explicitly specify positional=True, > required=False as part of the options definition. So let's follow. Change-Id: I77fdbcb905b1a7f2d535c3a37b2899118d1442c5 (cherry picked from commit aaa472bfa257aea53abcb3642ad4beeaed1b99a8) --- kolla/common/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index ec7dfe7633..b47af92189 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -223,7 +223,7 @@ ' push properly')), cfg.IntOpt('retries', short='r', default=3, min=0, help='The number of times to retry while building'), - cfg.MultiOpt('regex', types.String(), positional=True, + cfg.MultiOpt('regex', types.String(), positional=True, required=False, help=('Build only images matching regex and its' ' dependencies')), cfg.StrOpt('registry', From 067770667cf62195580a8406dda1219d6a709f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Wed, 15 Jan 2020 10:54:18 +0100 Subject: [PATCH 23/51] CI: Fix symlinks to failed logs Stop renaming files. Swift should be able to serve text/plain files based on content, not extension. Failed logs symlinks were broken because we stopped gzipping log files and improperly rewrote the logic there. Change-Id: Idddf51730821644948f51577807f5beaa18c6262 (cherry picked from commit 4a0182f15acbabc88df0aa660abce81d61f528da) --- tests/playbooks/post.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/tests/playbooks/post.yml b/tests/playbooks/post.yml index f423a70561..a7bc9efac5 100644 --- a/tests/playbooks/post.yml +++ b/tests/playbooks/post.yml @@ -61,18 +61,5 @@ # Parse build logs and extract pkg install info {{ ansible_user_dir }}/{{ zuul.project.src_dir }}/tests/files/process_build_logs.py -l build -b {{ base_distro }} > packages-info.txt - - # rename files to .txt; this is so that when displayed via - # logs.openstack.org clicking results in the browser shows the - # files, rather than trying to send it to another app or make you - # download it, etc. - - # firstly, rename all .log files to .txt files - for f in $(find . -name "*.log"); do - mv $f ${f/.log/.txt} - done - - # append .txt to all kolla config file - find kolla_configs -type f -exec mv '{}' '{}'.txt \; executable: /bin/bash chdir: "{{ kolla_logs_dir }}" From d9c63d7b81848677c8aa7bc4a6c9c3c0189ae8fd Mon Sep 17 00:00:00 2001 From: Dincer Celik Date: Sun, 19 Jan 2020 22:47:10 +0300 Subject: [PATCH 24/51] Fixes swift-object-expirer for Debian and Ubuntu binary images. Replaces 'swift-object' package with 'swift-object-expirer' package. Change-Id: I8fa3fcad88b35743e042d8a62ccee722b08af673 Closes-Bug: #1859607 (cherry picked from commit 190a6f7a264c1ea8c0c565d2b75fb73fdc29d500) --- docker/swift/swift-object-expirer/Dockerfile.j2 | 2 +- .../notes/swift-object-expirer-fix-b837de80cea4fb8e.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/swift-object-expirer-fix-b837de80cea4fb8e.yaml diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2 index 82ae2249c0..bbca2617af 100644 --- a/docker/swift/swift-object-expirer/Dockerfile.j2 +++ b/docker/swift/swift-object-expirer/Dockerfile.j2 @@ -10,7 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build # RDO packages swift-object-expirer in openstack-swift-proxy {% set swift_object_expirer_packages = ['openstack-swift-proxy'] %} {% elif base_package_type == 'deb' %} - {% set swift_object_expirer_packages = ['swift-object'] %} + {% set swift_object_expirer_packages = ['swift-object-expirer'] %} {% endif %} {{ macros.install_packages(swift_object_expirer_packages | customizable("packages")) }} diff --git a/releasenotes/notes/swift-object-expirer-fix-b837de80cea4fb8e.yaml b/releasenotes/notes/swift-object-expirer-fix-b837de80cea4fb8e.yaml new file mode 100644 index 0000000000..255acf26e8 --- /dev/null +++ b/releasenotes/notes/swift-object-expirer-fix-b837de80cea4fb8e.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes swift-object-expirer for Debian and Ubuntu binary images. + `LP#1859607 `__ From 0de137f86684122fd6d78a4349877f9437fc7f2d Mon Sep 17 00:00:00 2001 From: Dincer Celik Date: Tue, 21 Jan 2020 16:22:44 +0300 Subject: [PATCH 25/51] [stein] Bump versions Change-Id: I0a524bf7147446f7604ec3555fe926e7f251d736 --- kolla/common/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index b47af92189..d88bae5cc8 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -370,7 +370,7 @@ 'glance-base': { 'type': 'url', 'location': ('$tarballs_base/glance/' - 'glance-18.0.0.tar.gz')}, + 'glance-18.0.1.tar.gz')}, 'gnocchi-base': { 'type': 'git', 'reference': '4.3.2', From edc878574d9c6ef31d204607954869c6ccfd9da6 Mon Sep 17 00:00:00 2001 From: Dincer Celik Date: Fri, 24 Jan 2020 02:39:19 +0300 Subject: [PATCH 26/51] [stein] Bump versions Change-Id: Ib6c5a017adaa1f85b21976a30a63bc4363e4742d --- kolla/common/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index d88bae5cc8..7322f74356 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -383,7 +383,7 @@ 'horizon': { 'type': 'url', 'location': ('$tarballs_base/horizon/' - 'horizon-15.1.1.tar.gz')}, + 'horizon-15.2.0.tar.gz')}, 'horizon-plugin-blazar-dashboard': { 'type': 'url', 'location': ('$tarballs_base/blazar-dashboard/' From 983bee4f95bf524fee9c0b9f87ec105d005eca96 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 22 Jan 2020 08:42:57 +0100 Subject: [PATCH 27/51] Change fetch_fernet_tokens.py behaviour to check for minimum number of tokens Change is required to properly implement logic in fernet-node-sync.sh on kolla-ansible side - to add a check if fernet key store is populated with required number of tokens. Change-Id: I51ed61e34a1dd79532b4528e56a9cd9011d46e6d Related-Bug: #1846789 (cherry picked from commit 267cb8b14ae8472d00e09c2b5e35bda7de2de54f) --- docker/keystone/keystone-fernet/fetch_fernet_tokens.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/keystone/keystone-fernet/fetch_fernet_tokens.py b/docker/keystone/keystone-fernet/fetch_fernet_tokens.py index 0f739e9bf8..0c7e13e76b 100644 --- a/docker/keystone/keystone-fernet/fetch_fernet_tokens.py +++ b/docker/keystone/keystone-fernet/fetch_fernet_tokens.py @@ -48,7 +48,7 @@ def num_tokens(): def tokens_populated(expected): - return num_tokens() == int(expected) + return num_tokens() >= int(expected) def token_stale(seconds, filename='0'): @@ -71,7 +71,7 @@ def main(): help='Filename of token to check', default='0') parser.add_argument('-n', '--number', - help='Number of tokens that should exist', + help='Minimum number of tokens that should exist', required=True) args = parser.parse_args() From 757fe57563ed54e53c14c8cfae780b71fb49b7ba Mon Sep 17 00:00:00 2001 From: chenxing Date: Mon, 16 Sep 2019 14:46:41 +0800 Subject: [PATCH 28/51] nova-libvirt: add UEFI packages to support UEFI instances MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix inability to run UEFI-based images/instances by installing UEFI packages also in nova-libvirt image which is not based on nova-base. Adapted for Stein and below (e.g. Rocky) by removing any C8 support. Closes-Bug: #1814552 Co-authored-by: Marcin Juszkiewicz Co-authored-by: Radosław Piliszek Change-Id: I1d5cd3d9af98444acac5bedd7daeaa6c6673dcd6 (cherry picked from commit 15b68c15c1dd0c2df1cc49b550f2fa03a4c65e8e) (cherry picked from commit ffaf585d0f05ccd9123459bb0cdf345af5b09573) --- docker/nova/nova-libvirt/Dockerfile.j2 | 18 ++++++++++++++++++ .../notes/bug-1814552-a037354969dcf7e5.yaml | 6 ++++++ 2 files changed, 24 insertions(+) create mode 100644 releasenotes/notes/bug-1814552-a037354969dcf7e5.yaml diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index fb75e443a8..003bd9d3b3 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -31,6 +31,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% endif %} + {% if base_arch == 'x86_64' %} + {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'OVMF' + ] %} + {% elif base_arch == 'aarch64' %} + {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'AAVMF' + ] %} + {% endif %} + {% elif base_package_type == 'deb' %} {% set nova_libvirt_packages = [ @@ -54,6 +64,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% elif base_arch == "x86_64" %} {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'ovmf', 'qemu-kvm' ] %} {% endif %} @@ -78,6 +89,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build RUN rm -f /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml +{% elif base_package_type == 'rpm' %} + + {% if base_arch == 'x86_64' %} +# NOTE(jeffrey4l): for x86_64, nova will validate the existence of /usr/share/OVMF/OVMF_CODE.fd +RUN ln -sf /usr/share/OVMF/OVMF_CODE.secboot.fd /usr/share/OVMF/OVMF_CODE.fd + {% endif %} + {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start diff --git a/releasenotes/notes/bug-1814552-a037354969dcf7e5.yaml b/releasenotes/notes/bug-1814552-a037354969dcf7e5.yaml new file mode 100644 index 0000000000..207f6de5c7 --- /dev/null +++ b/releasenotes/notes/bug-1814552-a037354969dcf7e5.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fix inability to run UEFI-based images/instances by installing UEFI packages + also in nova-libvirt image which is not based on nova-base. + `LP#1814552 ` From 1b3d1254c463fbf0700562b20a4e832ac7ab7380 Mon Sep 17 00:00:00 2001 From: Dincer Celik Date: Sat, 8 Feb 2020 11:35:23 +0300 Subject: [PATCH 29/51] [stein] Bump versions Change-Id: I5f27a47caa3fc644fd1b575bf70935e746c6b5c8 --- kolla/common/config.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index 7322f74356..05b90f84d4 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -315,7 +315,7 @@ 'bifrost-base': { 'type': 'url', 'location': ('$tarballs_base/bifrost/' - 'bifrost-6.0.2.tar.gz')}, + 'bifrost-6.0.3.tar.gz')}, 'blazar-base': { 'type': 'url', 'location': ('$tarballs_base/blazar/' @@ -415,7 +415,7 @@ 'horizon-plugin-ironic-ui': { 'type': 'url', 'location': ('$tarballs_base/ironic-ui/' - 'ironic-ui-3.4.0.tar.gz')}, + 'ironic-ui-3.4.1.tar.gz')}, 'horizon-plugin-karbor-dashboard': { 'type': 'url', 'location': ('$tarballs_base/karbor-dashboard/' @@ -499,7 +499,7 @@ 'ironic-inspector': { 'type': 'url', 'location': ('$tarballs_base/ironic-inspector/' - 'ironic-inspector-8.2.3.tar.gz')}, + 'ironic-inspector-8.2.4.tar.gz')}, 'karbor-base': { 'type': 'url', 'location': ('$tarballs_base/karbor/' @@ -656,7 +656,7 @@ 'nova-base': { 'type': 'url', 'location': ('$tarballs_base/nova/' - 'nova-19.0.3.tar.gz')}, + 'nova-19.1.0.tar.gz')}, 'nova-base-plugin-blazar': { 'type': 'url', 'location': ('$tarballs_base/blazar-nova/' From cbfded882cb951c95d3832aae0b1c38711e4a654 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 12 Feb 2020 18:20:15 +0100 Subject: [PATCH 30/51] Bump Gnocchi to 4.3.4 It includes several bug fixes, in particular one for an issue when coordination is disabled [1]. [1] https://github.com/gnocchixyz/gnocchi/issues/996 Change-Id: I0ac41463bd6ca1eb363e1c5cdc29f7222ec382b1 --- kolla/common/config.py | 2 +- .../notes/upgrade-gnocchi-to-4.3.4-297be1fc7e3b3bd5.yaml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/upgrade-gnocchi-to-4.3.4-297be1fc7e3b3bd5.yaml diff --git a/kolla/common/config.py b/kolla/common/config.py index 05b90f84d4..20dd64dbe3 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -373,7 +373,7 @@ 'glance-18.0.1.tar.gz')}, 'gnocchi-base': { 'type': 'git', - 'reference': '4.3.2', + 'reference': '4.3.4', 'location': ('https://github.com/gnocchixyz/' 'gnocchi.git')}, 'heat-base': { diff --git a/releasenotes/notes/upgrade-gnocchi-to-4.3.4-297be1fc7e3b3bd5.yaml b/releasenotes/notes/upgrade-gnocchi-to-4.3.4-297be1fc7e3b3bd5.yaml new file mode 100644 index 0000000000..68f0789fca --- /dev/null +++ b/releasenotes/notes/upgrade-gnocchi-to-4.3.4-297be1fc7e3b3bd5.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Upgrades Gnocchi from 4.3.2 to 4.3.4. This version includes several bug + fixes, in particular one for `an issue when coordination is disabled + `__. This minor version + upgrade shouldn't require any intervention from the operator. From 85e1ef6092e96ef96a695fd6574f8d20a4fd52e5 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 26 Feb 2020 17:01:25 +0100 Subject: [PATCH 31/51] Bump stein versions Change-Id: I51ebb3e35c08ab0e2402508c9f833aa0fa71cef0 --- kolla/common/config.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index 20dd64dbe3..3ff5cc0499 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -403,7 +403,7 @@ 'horizon-plugin-fwaas-dashboard': { 'type': 'url', 'location': ('$tarballs_base/neutron-fwaas-dashboard/' - 'neutron-fwaas-dashboard-2.0.1.tar.gz')}, + 'neutron-fwaas-dashboard-2.0.2.tar.gz')}, 'horizon-plugin-freezer-web-ui': { 'type': 'url', 'location': ('$tarballs_base/freezer-web-ui/' @@ -447,7 +447,7 @@ 'horizon-plugin-neutron-vpnaas-dashboard': { 'type': 'url', 'location': ('$tarballs_base/neutron-vpnaas-dashboard/' - 'neutron-vpnaas-dashboard-1.5.1.tar.gz')}, + 'neutron-vpnaas-dashboard-1.5.2.tar.gz')}, 'horizon-plugin-octavia-dashboard': { 'type': 'url', 'location': ('$tarballs_base/octavia-dashboard/' @@ -572,7 +572,7 @@ 'neutron-base': { 'type': 'url', 'location': ('$tarballs_base/neutron/' - 'neutron-14.0.4.tar.gz')}, + 'neutron-14.1.0.tar.gz')}, 'neutron-base-plugin-neutron-fwaas': { 'type': 'url', 'location': ('$tarballs_base/neutron-fwaas/' @@ -600,7 +600,7 @@ 'neutron-base-plugin-vpnaas-agent': { 'type': 'url', 'location': ('$tarballs_base/neutron-vpnaas/' - 'neutron-vpnaas-14.0.0.tar.gz')}, + 'neutron-vpnaas-14.0.1.tar.gz')}, 'neutron-bgp-dragent': { 'type': 'url', 'location': ('$tarballs_base/neutron-dynamic-routing/' @@ -612,7 +612,7 @@ 'neutron-server-opendaylight-plugin-networking-odl': { 'type': 'url', 'location': ('$tarballs_base/networking-odl/' - 'networking-odl-14.0.0.tar.gz')}, + 'networking-odl-14.0.1.tar.gz')}, 'neutron-server-opendaylight-plugin-networking-bgpvpn': { 'type': 'url', 'location': ('$tarballs_base/networking-bgpvpn/' @@ -644,15 +644,15 @@ 'neutron-vpnaas-agent': { 'type': 'url', 'location': ('$tarballs_base/neutron-vpnaas/' - 'neutron-vpnaas-14.0.0.tar.gz')}, + 'neutron-vpnaas-14.0.1.tar.gz')}, 'neutron-server-ovn-plugin-networking-ovn': { 'type': 'url', 'location': ('$tarballs_base/networking-ovn/' - 'networking-ovn-6.0.0.tar.gz')}, + 'networking-ovn-6.0.1.tar.gz')}, 'neutron-metadata-agent-ovn-plugin-networking-ovn': { 'type': 'url', 'location': ('$tarballs_base/networking-ovn/' - 'networking-ovn-6.0.0.tar.gz')}, + 'networking-ovn-6.0.1.tar.gz')}, 'nova-base': { 'type': 'url', 'location': ('$tarballs_base/nova/' From aabd2ac49013f8f489691a0132edf9fc919b1243 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 20 May 2019 19:00:33 +0100 Subject: [PATCH 32/51] Ignore EM releases in version-check.py We don't want to use Extended Maintenance (EM) tags, since these are just markers of a point in time and not available as released artifacts. Change-Id: If552f7ffc22d4b25769c14c083179eecf5a93158 (cherry picked from commit f528ad81026526af02610aa3e08200fd53b87ab9) --- tools/version-check.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/version-check.py b/tools/version-check.py index 7dfb870d89..f9afdad941 100755 --- a/tools/version-check.py +++ b/tools/version-check.py @@ -87,6 +87,10 @@ def load_all_info(openstack_release): if 'releases' in info and len(info['releases']) > 0: latest_release = info['releases'][-1] latest_version = latest_release['version'] + if latest_version.endswith('-em') and len(info['releases']) > 1: + # Ignore Extended Maintenance (EM) releases, e.g. pike-em. + latest_release = info['releases'][-2] + latest_version = latest_release['version'] for project in latest_release['projects']: project_name = project['repo'].split('/')[-1] From 7c2199665a928c2ccb54ea4f7376629e67426240 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 27 Feb 2020 18:09:48 +0100 Subject: [PATCH 33/51] Bump stein versions Change-Id: Ie7a5d74e4640e5ec5e9885b4733551cf050d0853 --- kolla/common/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index 3ff5cc0499..226b0ebc96 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -323,7 +323,7 @@ 'ceilometer-base': { 'type': 'url', 'location': ('$tarballs_base/ceilometer/' - 'ceilometer-12.0.0.tar.gz')}, + 'ceilometer-12.1.0.tar.gz')}, 'ceilometer-base-plugin-panko': { 'type': 'url', 'location': ('$tarballs_base/panko/' From d53ead9421a288137fba8e20b22844d1cdce6506 Mon Sep 17 00:00:00 2001 From: Xing Zhang Date: Fri, 28 Feb 2020 15:11:30 +0800 Subject: [PATCH 34/51] Fix kolla_toolbox_pip_virtualenv_packages override backport: train, stein, rocky Override in filter needs to follow the rule: __ `call_type` for `kolla_toolbox_pip_virtualenv_packages` should be `pip_virtualenv_packages`, and `pip_packages` can't match with `kolla_toolbox_pip_virtualenv_packages`, this makes the value can't be overrode in template override. Change-Id: I1dbe2dfd4bce73ce2285f45f997d45b5dcc95f4c Closes-bug: #1865119 (cherry picked from commit 74d5a66e6bf744ad936d702443a8d64be86441ba) --- docker/kolla-toolbox/Dockerfile.j2 | 2 +- ...ix-kolla-toolbox-venv-customisation-dc66f7bc621908a8.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix-kolla-toolbox-venv-customisation-dc66f7bc621908a8.yaml diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 72de96e6aa..479448e72f 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -54,7 +54,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'virtualenv' ] %} -RUN {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages|customizable("pip_packages"), constraints=false) }} \ +RUN {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages | customizable("pip_virtualenv_packages"), constraints=false) }} \ && virtualenv --system-site-packages {{ virtualenv_path }} ENV PATH {{ virtualenv_path }}/bin:$PATH diff --git a/releasenotes/notes/fix-kolla-toolbox-venv-customisation-dc66f7bc621908a8.yaml b/releasenotes/notes/fix-kolla-toolbox-venv-customisation-dc66f7bc621908a8.yaml new file mode 100644 index 0000000000..9195ebdefa --- /dev/null +++ b/releasenotes/notes/fix-kolla-toolbox-venv-customisation-dc66f7bc621908a8.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fix ``kolla_toolbox_pip_virtualenv_packages`` customisation. + `LP#1865119 `__ From a83173da818e8a4b14812dd111f017b34beb6abc Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 9 Jan 2020 18:32:32 +0100 Subject: [PATCH 35/51] Adapt fetch-fernet-tokens script to Python 3 Backport: train Closes-Bug: #1859047 Change-Id: I9032e43bffa3a3de6c33a4ab59f65bafb0129dd5 (cherry picked from commit 902f16cb1a8efc44da8669a6707d93d47160ae9d) --- docker/keystone/keystone-fernet/fetch_fernet_tokens.py | 2 +- releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml diff --git a/docker/keystone/keystone-fernet/fetch_fernet_tokens.py b/docker/keystone/keystone-fernet/fetch_fernet_tokens.py index 0c7e13e76b..4371f9c402 100644 --- a/docker/keystone/keystone-fernet/fetch_fernet_tokens.py +++ b/docker/keystone/keystone-fernet/fetch_fernet_tokens.py @@ -43,7 +43,7 @@ def has_file(filename_path): def num_tokens(): - _, _, files = os.walk(TOKEN_PATH).next() + _, _, files = next(os.walk(TOKEN_PATH)) return len(files) diff --git a/releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml b/releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml new file mode 100644 index 0000000000..0ab49384ca --- /dev/null +++ b/releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fix bug which caused Keystone Fernet key distribution to fail on Python 3 systems, + by adapting fetch-fernet-keys.py script to work on Python 3. + `LP#1859047 ` From b12db74f59c5bcb1db03629a5f561186c5d32e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Tue, 3 Mar 2020 20:24:28 +0100 Subject: [PATCH 36/51] Fix renos to backport before releases Change-Id: I467da5e7e2e59d226987db970ea80c161bc454e4 (cherry picked from commit 0b10e5ca800388b193e5ef2e85ffd6bf64bcae10) --- releasenotes/notes/bug-1814552-a037354969dcf7e5.yaml | 2 +- releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/releasenotes/notes/bug-1814552-a037354969dcf7e5.yaml b/releasenotes/notes/bug-1814552-a037354969dcf7e5.yaml index 207f6de5c7..fbff1f038c 100644 --- a/releasenotes/notes/bug-1814552-a037354969dcf7e5.yaml +++ b/releasenotes/notes/bug-1814552-a037354969dcf7e5.yaml @@ -3,4 +3,4 @@ fixes: - | Fix inability to run UEFI-based images/instances by installing UEFI packages also in nova-libvirt image which is not based on nova-base. - `LP#1814552 ` + `LP#1814552 `__ diff --git a/releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml b/releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml index 0ab49384ca..68e8d5f4fa 100644 --- a/releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml +++ b/releasenotes/notes/bug-1859047-d41762357da8ae0b.yaml @@ -3,4 +3,4 @@ fixes: - | Fix bug which caused Keystone Fernet key distribution to fail on Python 3 systems, by adapting fetch-fernet-keys.py script to work on Python 3. - `LP#1859047 ` + `LP#1859047 `__ From c139ac59163dec120fb57b78ae19b5bce7237d30 Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Wed, 5 Feb 2020 16:31:06 -0600 Subject: [PATCH 37/51] Add ssh clients to Ironic Conductor container Adds ssh clients to Ironic Conductor container for ansible deploy interface. Change-Id: Ib995c6ebe5ee76ee1a39e4b5918a79bd61b87a01 Closes-Bug: #1862079 (cherry picked from commit 7234e8b2f72275c85caa146a6d9e49d1ab8281b7) --- docker/ironic/ironic-conductor/Dockerfile.j2 | 4 ++++ ...openssh-clients-to-ironic-conductor-7275bd65dfe238a6.yaml | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 releasenotes/notes/add-openssh-clients-to-ironic-conductor-7275bd65dfe238a6.yaml diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index ba62c50ec4..1a4a41eb62 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -13,6 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'e2fsprogs', 'gdisk', 'ipmitool', + 'openssh-clients', 'openstack-ironic-conductor', 'openstack-ironic-staging-drivers', 'parted', @@ -67,6 +68,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'gdisk', 'ipmitool', 'ironic-conductor', + 'openssh-client', 'parted', 'psmisc', 'python3-ironic-inspector-client', @@ -88,6 +90,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'fuse', 'gdisk', 'ipmitool', + 'openssh-clients', 'parted', 'psmisc', 'qemu-img-ev', @@ -111,6 +114,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'e2fsprogs', 'gdisk', 'ipmitool', + 'openssh-client', 'parted', 'psmisc', 'qemu-utils', diff --git a/releasenotes/notes/add-openssh-clients-to-ironic-conductor-7275bd65dfe238a6.yaml b/releasenotes/notes/add-openssh-clients-to-ironic-conductor-7275bd65dfe238a6.yaml new file mode 100644 index 0000000000..d7d1fef2f4 --- /dev/null +++ b/releasenotes/notes/add-openssh-clients-to-ironic-conductor-7275bd65dfe238a6.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Adds openssh-clients to ironic conductor container build to enable + ansible deploy interface to function properly. From a9f759d1dc23445c192c9f300275317fc372a8d5 Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Thu, 30 Jan 2020 08:16:18 -0600 Subject: [PATCH 38/51] Adds python3-systemd for ansible deploy interface When doing a source install, ironic doesn't have python3-systemd as a dependency and the current ironic-conductor container doesn't install the required dependencies which causes the ansible deploy interface to fail with the error, "Systemd bindings do not exist". This adds the needed dependencies when doing a source build. This installs the needed files for both rpm and deb builds on python 2.x and 3.x. Change-Id: I5d1bcb0f7d7902b4e122c12697483433bcf52ca2 Closes-Bug: #1861427 (cherry picked from commit 4a67e58f7971641c55247f02985e13ef391ca7ab) --- docker/ironic/ironic-conductor/Dockerfile.j2 | 3 +++ ...-python3-systemd-for-ironic-source-9a6883496e101da9.yaml | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100644 releasenotes/notes/add-python3-systemd-for-ironic-source-9a6883496e101da9.yaml diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index ba62c50ec4..385c64a4ac 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -97,10 +97,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% if distro_python_version.startswith('3') %} {% set ironic_conductor_packages = ironic_conductor_packages + [ + 'python3-systemd', 'systemd-udev', ] %} {% else %} {% set ironic_conductor_packages = ironic_conductor_packages + [ + 'systemd-python', 'systemd', ] %} {% endif %} @@ -113,6 +115,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'ipmitool', 'parted', 'psmisc', + 'python-systemd', 'qemu-utils', 'shellinabox', 'udev', diff --git a/releasenotes/notes/add-python3-systemd-for-ironic-source-9a6883496e101da9.yaml b/releasenotes/notes/add-python3-systemd-for-ironic-source-9a6883496e101da9.yaml new file mode 100644 index 0000000000..c1ed377f2f --- /dev/null +++ b/releasenotes/notes/add-python3-systemd-for-ironic-source-9a6883496e101da9.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Adds python3-systemd package to ironic-conductor source based + container to allow the Ansible deploy interface to function + correctly. Fixes bug #1861427 From 84003367bcd20c24f2e5884f5d86d2420506e816 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 16 Mar 2020 12:23:50 +0100 Subject: [PATCH 39/51] kibana, nova-libvirt: handle it properly for non-x86 manual backport from master changes: - https://review.opendev.org/#/c/712987/ - https://review.opendev.org/#/c/713403 Upstream kibana package contains NodeJS x86-64 binaries so can not be used directly on non-x86 architectures. I took upstream packages, removed NodeJS binary from it and added 'nodejs' dependency. Package is present in my Linaro OBS repository where I keep other packages needed for aarch64 kolla run. Via APT pinning I mark them as not wanted so they are not used on any architecture with two exceptions: 1. libvirt - we need fixed version to be able to use ThunderX servers 2. kibana - to be able to run it at all For x86-64 upstream kibana package is used. Closes-bug: #1867365 Change-Id: I955619d6992f8714ae753dc155e248d255340ecf --- docker/base/apt_preferences.debian | 29 +++++++++++++++++++++++++++++ docker/base/sources.list.debian | 3 +++ 2 files changed, 32 insertions(+) diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index e69de29bb2..76fa93576e 100644 --- a/docker/base/apt_preferences.debian +++ b/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 diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian index 30b28d9053..f8e2fe514e 100644 --- a/docker/base/sources.list.debian +++ b/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 ./ From 6c61b5082f02d7027233197855b343b8cc3ba9bd Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 17 Mar 2020 09:25:28 +0000 Subject: [PATCH 40/51] CI: Install tox tox will be removed from the base image. Install it before that happens. This change is made in a simple way that can be easily backported. Change-Id: I2a24c87aa44c1e03ba76a2fb0bd71caf54eb4211 (cherry picked from commit a81413fc52b0eaf1eefc3302ba425ac9b93d5a4d) --- tests/playbooks/pre.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/playbooks/pre.yml b/tests/playbooks/pre.yml index e721d88592..b7f5a64912 100644 --- a/tests/playbooks/pre.yml +++ b/tests/playbooks/pre.yml @@ -15,3 +15,8 @@ file: path: "{{ kolla_build_logs_dir }}" state: directory + + - name: Ensure tox is installed + pip: + name: tox + become: true From 1a0886f84fa1fbee91dfeff628f4e2e77c9ef7a7 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 18 Mar 2020 13:52:14 +0100 Subject: [PATCH 41/51] mariadb: install mariabackup on Debian On AArch64 systems we are unable to deploy Stein due to lack of mariabackup command. Change-Id: I00b8c945470a0f63f23f2d0da74eed3189f5d9e5 Closes-bug: #1867750 --- docker/mariadb/Dockerfile.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 1ee8752225..c02c6214a9 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -27,6 +27,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% if base_distro == 'debian' %} {% set mariadb_packages = mariadb_packages + [ + 'mariadb-backup', 'mariadb-server' ] %} {% else %} From 58a8e81897a12e95f1b75c058e57afafd705b828 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 24 Mar 2020 15:07:04 +0000 Subject: [PATCH 42/51] Bump service versions (Stein) Change-Id: I9c94d95287ef8956556de5d48b7e88b69457e60f --- kolla/common/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index 226b0ebc96..6611b67e5c 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -495,7 +495,7 @@ 'ironic-base': { 'type': 'url', 'location': ('$tarballs_base/ironic/' - 'ironic-12.1.3.tar.gz')}, + 'ironic-12.1.4.tar.gz')}, 'ironic-inspector': { 'type': 'url', 'location': ('$tarballs_base/ironic-inspector/' From 519eced6147085151a3e53a55c734c28d1e35eeb Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 2 Apr 2020 14:34:36 +0100 Subject: [PATCH 43/51] Fix multiple CI issues 1. Pin openstacksdk and client libraries in kolla-toolbox Stein and below only. openstacksdk released 0.45.0 (and possibly 0.44.0 as well) which dropped py2 compat but did not advertise the fact. It was amended later but it will now always affect kolla images until pinned to older. The observable error is: "ImportError: No module named queue" Since Train we pin u-c, but not before that. This change introduces a version constraint for openstacksdk and client libs: - python-novaclient - python-cinderclient - python-keystoneclient - python-glanceclient 2. Make deploy jobs non-voting For similar reasons to 1., the deploy jobs fail when using the openstack client for testing. Due to a dependency loop between these two projects, we must make these jobs non-voting to fix the image build. This should be reverted ASAP. 3. CI: Add https match for mirror.centos.org to template-overrides Some CentOS repos (currently one - Ceph NFS Ganesha) use https://mirror.centos.org instead of http:// and we break their definition by removing mirrorlist= entry and not inserting baseurl entry due to a missing match. Original Change-Id: I7b29f8c6be80820042023d2b85162d5cc9a65f08 Change-Id: I8c2da6437333210a7926f2deb926ab5d1c93c3c6 Closes-Bug: #1870349 --- .zuul.d/centos.yaml | 12 +++++++++--- .zuul.d/oraclelinux.yaml | 8 ++++++-- .zuul.d/ubuntu.yaml | 12 +++++++++--- docker/kolla-toolbox/Dockerfile.j2 | 5 +++++ tests/templates/template_overrides.j2 | 7 +++++++ 5 files changed, 36 insertions(+), 8 deletions(-) diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index 98a6d8ab50..93608cc805 100644 --- a/.zuul.d/centos.yaml +++ b/.zuul.d/centos.yaml @@ -4,9 +4,15 @@ jobs: - kolla-build-centos-binary - kolla-build-centos-source - - kolla-ansible-centos-source - - kolla-ansible-centos-binary - - kolla-ansible-centos-source-upgrade + - kolla-ansible-centos-source: + # FIXME(mgoddard): Revert this when kolla-ansible CI passes. + voting: false + - kolla-ansible-centos-binary: + # FIXME(mgoddard): Revert this when kolla-ansible CI passes. + voting: false + - kolla-ansible-centos-source-upgrade: + # FIXME(mgoddard): Revert this when kolla-ansible CI passes. + voting: false - tripleo-build-containers-centos-7: # FIXME(yoctozepto): set to voting when TripleO CI is fixed voting: false diff --git a/.zuul.d/oraclelinux.yaml b/.zuul.d/oraclelinux.yaml index 4f0cd4f352..bbcd9a3db5 100644 --- a/.zuul.d/oraclelinux.yaml +++ b/.zuul.d/oraclelinux.yaml @@ -4,8 +4,12 @@ jobs: - kolla-build-oraclelinux-binary - kolla-build-oraclelinux-source - - kolla-ansible-oraclelinux-source - - kolla-ansible-oraclelinux-binary + - kolla-ansible-oraclelinux-source: + # FIXME(mgoddard): Revert this when kolla-ansible CI passes. + voting: false + - kolla-ansible-oraclelinux-binary: + # FIXME(mgoddard): Revert this when kolla-ansible CI passes. + voting: false - kolla-ansible-oraclelinux-source-ceph: files: ^docker\/(ceph|cinder)\/.* gate: diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml index 6d6cf8fe04..efa9060f81 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.zuul.d/ubuntu.yaml @@ -4,9 +4,15 @@ jobs: - kolla-build-ubuntu-binary - kolla-build-ubuntu-source - - kolla-ansible-ubuntu-source - - kolla-ansible-ubuntu-binary - - kolla-ansible-ubuntu-source-upgrade + - kolla-ansible-ubuntu-source: + # FIXME(mgoddard): Revert this when kolla-ansible CI passes. + voting: false + - kolla-ansible-ubuntu-binary: + # FIXME(mgoddard): Revert this when kolla-ansible CI passes. + voting: false + - kolla-ansible-ubuntu-source-upgrade: + # FIXME(mgoddard): Revert this when kolla-ansible CI passes. + voting: false - kolla-ansible-ubuntu-source-zun: files: ^docker\/(zun|kuryr)\/.* - kolla-ansible-ubuntu-source-ceph: diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 479448e72f..ef72da3dc4 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -64,9 +64,14 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH '"cmd2<0.9.0"', 'influxdb', 'mysqlclient', + '"openstacksdk<0.28.0"', 'os-client-config==1.29.0', 'pbr==4.0.0', 'pymongo', + '"python-cinderclient<5.0.0"', + '"python-glanceclient<2.17.0"', + '"python-keystoneclient<3.20.0"', + '"python-novaclient<14.0.0"', 'python-openstackclient==3.14.0', 'pytz', 'pyudev', diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index 2f9429b0d2..8997bc4ed9 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -23,6 +23,9 @@ RUN echo 'APT::Get::AllowUnauthenticated "true";' > /etc/apt/apt.conf.d/99allow- RUN sed -i -e "/^mirrorlist/d" \ -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \ + -e "s|^#baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \ + -e "s|^baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \ + -e "s|^baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \ /etc/yum.repos.d/CentOS-Base.repo {% raw %} @@ -44,7 +47,9 @@ RUN sed -i -e "/^mirrorlist/d" \ -e "/^metalink/d" \ -e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|g" \ -e "s|^baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ + -e "s|^baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ + -e "s|^#baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ -e "s|^baseurl=https://packages.elastic.co|baseurl={{ nodepool_elastic_proxy }}|g" \ -e "s|^baseurl=https://packagecloud.io/grafana|baseurl={{ nodepool_grafana_proxy }}|g" \ -e "s|^baseurl=https://trunk.rdoproject.org|baseurl=http://{{ nodepool_rdo_proxy }}|g" \ @@ -59,8 +64,10 @@ RUN sed -i -e "/^mirrorlist/d" \ RUN sed -i -e "/^mirrorlist/d" \ -e "/^metalink/d" \ -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ + -e "s|^#baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ -e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|g" \ -e "s|^baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ + -e "s|^baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ -e "s|^baseurl=https://packages.elastic.co|baseurl={{ nodepool_elastic_proxy }}|g" \ -e "s|^baseurl=https://packagecloud.io/grafana|baseurl={{ nodepool_grafana_proxy }}|g" \ -e "s|^baseurl=https://trunk.rdoproject.org|baseurl=http://{{ nodepool_rdo_proxy }}|g" \ From 4696fc0f322bdc4327b0ac4ec58f2ddc9d014ec1 Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Tue, 10 Mar 2020 12:46:17 +0100 Subject: [PATCH 44/51] Fix invalid test in cinder data migration script The extend_start.sh script for cinder-api uses an incorrect test to check if the MAX_NUMBER variable is set. This leads to a incorrect cinder-manage command being run if this variable is not set, making the database migration fail. This change fixes the test to properly use the MAX_NUMBER variable. Change-Id: Ie46da709db0de09a9cf641b3c154275282f213fc Closes-Bug: #1866827 (cherry picked from commit ff42ff20048ef3b7d2f8df04ada8ff4bf7b710e0) --- docker/cinder/cinder-api/extend_start.sh | 2 +- releasenotes/notes/bug-1866827-5351ec43486d7f33.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/bug-1866827-5351ec43486d7f33.yaml diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh index 251b9d1059..4993bb4937 100644 --- a/docker/cinder/cinder-api/extend_start.sh +++ b/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 diff --git a/releasenotes/notes/bug-1866827-5351ec43486d7f33.yaml b/releasenotes/notes/bug-1866827-5351ec43486d7f33.yaml new file mode 100644 index 0000000000..63fae75ec0 --- /dev/null +++ b/releasenotes/notes/bug-1866827-5351ec43486d7f33.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes the MAX_NUMBER variable usage when running the database online + migrations for cinder. From fc0967b88212c2626c1469e74223515677785c6b Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 6 Apr 2020 12:51:42 +0100 Subject: [PATCH 45/51] Make deploy jobs voting again These were temporarily made non-voting in I8c2da6437333210a7926f2deb926ab5d1c93c3c6 to allow us to fix CI. Change-Id: I498aa50a0d59d090486d60c2b34b4f2fd077d401 --- .zuul.d/centos.yaml | 12 +++--------- .zuul.d/oraclelinux.yaml | 8 ++------ .zuul.d/ubuntu.yaml | 12 +++--------- 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index 93608cc805..98a6d8ab50 100644 --- a/.zuul.d/centos.yaml +++ b/.zuul.d/centos.yaml @@ -4,15 +4,9 @@ jobs: - kolla-build-centos-binary - kolla-build-centos-source - - kolla-ansible-centos-source: - # FIXME(mgoddard): Revert this when kolla-ansible CI passes. - voting: false - - kolla-ansible-centos-binary: - # FIXME(mgoddard): Revert this when kolla-ansible CI passes. - voting: false - - kolla-ansible-centos-source-upgrade: - # FIXME(mgoddard): Revert this when kolla-ansible CI passes. - voting: false + - kolla-ansible-centos-source + - kolla-ansible-centos-binary + - kolla-ansible-centos-source-upgrade - tripleo-build-containers-centos-7: # FIXME(yoctozepto): set to voting when TripleO CI is fixed voting: false diff --git a/.zuul.d/oraclelinux.yaml b/.zuul.d/oraclelinux.yaml index bbcd9a3db5..4f0cd4f352 100644 --- a/.zuul.d/oraclelinux.yaml +++ b/.zuul.d/oraclelinux.yaml @@ -4,12 +4,8 @@ jobs: - kolla-build-oraclelinux-binary - kolla-build-oraclelinux-source - - kolla-ansible-oraclelinux-source: - # FIXME(mgoddard): Revert this when kolla-ansible CI passes. - voting: false - - kolla-ansible-oraclelinux-binary: - # FIXME(mgoddard): Revert this when kolla-ansible CI passes. - voting: false + - kolla-ansible-oraclelinux-source + - kolla-ansible-oraclelinux-binary - kolla-ansible-oraclelinux-source-ceph: files: ^docker\/(ceph|cinder)\/.* gate: diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml index efa9060f81..6d6cf8fe04 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.zuul.d/ubuntu.yaml @@ -4,15 +4,9 @@ jobs: - kolla-build-ubuntu-binary - kolla-build-ubuntu-source - - kolla-ansible-ubuntu-source: - # FIXME(mgoddard): Revert this when kolla-ansible CI passes. - voting: false - - kolla-ansible-ubuntu-binary: - # FIXME(mgoddard): Revert this when kolla-ansible CI passes. - voting: false - - kolla-ansible-ubuntu-source-upgrade: - # FIXME(mgoddard): Revert this when kolla-ansible CI passes. - voting: false + - kolla-ansible-ubuntu-source + - kolla-ansible-ubuntu-binary + - kolla-ansible-ubuntu-source-upgrade - kolla-ansible-ubuntu-source-zun: files: ^docker\/(zun|kuryr)\/.* - kolla-ansible-ubuntu-source-ceph: From 8d0af2871dae761cba50638edc650cf9a5ea2996 Mon Sep 17 00:00:00 2001 From: Dincer Celik Date: Sat, 4 Apr 2020 15:38:56 +0300 Subject: [PATCH 46/51] Bump versions (Stein) Change-Id: Ie4a85d84aef4dda7acee10c08f1377d521479963 --- kolla/common/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index 6611b67e5c..acdc790931 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -331,7 +331,7 @@ 'cinder-base': { 'type': 'url', 'location': ('$tarballs_base/cinder/' - 'cinder-14.0.3.tar.gz')}, + 'cinder-14.0.4.tar.gz')}, 'congress-base': { 'type': 'url', 'location': ('$tarballs_base/congress/' From 80caffa8c81f3d0d79fcdd7682acbcffae3efdce Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 8 Apr 2020 11:19:28 +0100 Subject: [PATCH 47/51] Sensu: Remove ceph and process-checks plugins from client The sensu image became unbuildable, failing to install the ceph plugin: Unable to resolve dependencies: sensu-plugins-ceph requires english (= 0.6.3) This has happened because the author of the 'english' gem has seen fit to publish a new 0.7.0 release, and 'yank' [1] all previous releases from rubygems. This change removes the ceph and process-checks plugins, which both suffer from a dependency on the yanked english 0.6.3. [1] https://rubygems.org/gems/english/versions/0.6.3 Change-Id: I9d34413fa10b5a2920aca60b08141bfaddcc7415 Closes-Bug: #1871600 (cherry picked from commit 818dc4d6ff12a3119be072e0c68e2d2c8da9b799) --- docker/sensu/sensu-client/Dockerfile.j2 | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/sensu/sensu-client/Dockerfile.j2 b/docker/sensu/sensu-client/Dockerfile.j2 index 51913b340e..9ccd4f3ae2 100644 --- a/docker/sensu/sensu-client/Dockerfile.j2 +++ b/docker/sensu/sensu-client/Dockerfile.j2 @@ -61,7 +61,6 @@ RUN echo '{{ image_name }} not yet available for {{ base_distro }}' \ # Let's cap them to the known major version that works with the ruby shipped on # rhel/centos/oraclelinux (currently 2.0) {% set sensu_plugins = [ - 'ceph:"~>1"', 'cpu-checks:"~>1"', 'disk-checks:"~>2"', 'dns:"~>1"', @@ -79,7 +78,6 @@ RUN echo '{{ image_name }} not yet available for {{ base_distro }}' \ 'network-checks:"~>2"', 'ntp:"~>1"', 'openstack:"~>1"', - 'process-checks:"~>2"', 'rabbitmq:"~>3"', 'redis:"~>2"', 'uptime-checks:"~>1"', From f7cf4df5ada5553ce4cf2433ebf40276fe59a803 Mon Sep 17 00:00:00 2001 From: "Q.hongtao" Date: Tue, 7 Apr 2020 09:30:42 +0800 Subject: [PATCH 48/51] Add vitrage-persistor image Kolla was missing vitrage-persistor image required by Vitrage for data storage. Change-Id: Id5e143636f9a81e7294b775f3d8b9134bee58054 Closes-Bug: #1869319 (cherry picked from commit ad06096448a585a16ad73b610b0adc81b597ccec) --- .../vitrage/vitrage-persistor/Dockerfile.j2 | 42 +++++++++++++++++++ .../notes/bug-1869319-aa032c1330b540dc.yaml | 6 +++ 2 files changed, 48 insertions(+) create mode 100644 docker/vitrage/vitrage-persistor/Dockerfile.j2 create mode 100644 releasenotes/notes/bug-1869319-aa032c1330b540dc.yaml diff --git a/docker/vitrage/vitrage-persistor/Dockerfile.j2 b/docker/vitrage/vitrage-persistor/Dockerfile.j2 new file mode 100644 index 0000000000..f07d930f33 --- /dev/null +++ b/docker/vitrage/vitrage-persistor/Dockerfile.j2 @@ -0,0 +1,42 @@ +FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} +{% block labels %} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} + +{% block vitrage_persistor_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} + + {% if base_package_type == 'rpm' %} + + {% set vitrage_persistor_packages = [ + 'openstack-vitrage-persistor' + ] %} + +{{ macros.install_packages(vitrage_persistor_packages | customizable("packages")) }} + + {% elif base_package_type == 'deb' %} + {% if base_distro == 'debian' %} + + {% set vitrage_persistor_packages = [ + 'vitrage-persistor' + ] %} + +{{ macros.install_packages(vitrage_persistor_packages | customizable("packages")) }} + + {% else %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + + {% endif %} + {% endif %} + +{% endif %} + +{% block vitrage_persistor_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER vitrage diff --git a/releasenotes/notes/bug-1869319-aa032c1330b540dc.yaml b/releasenotes/notes/bug-1869319-aa032c1330b540dc.yaml new file mode 100644 index 0000000000..1e6cd825f1 --- /dev/null +++ b/releasenotes/notes/bug-1869319-aa032c1330b540dc.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Adds missing ``vitrage-persistor`` image, required by Vitrage + deployments for storing data. + `LP#1869319 `__ From ab8bcf5a4f4b1a6a8ae698eda80f2a93d00aa84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Wed, 4 Mar 2020 10:22:19 +0100 Subject: [PATCH 49/51] Ensure proper JSON in keystone bootstrap This fixes the issue when keystone-manage output included backslashes and/or double quotation marks which broke JSON string. Change-Id: Ifae18c407210c12745d29fc4c95dca69aeafe6a8 Closes-bug: #1866017 (cherry picked from commit 33d184a731458bb45d1206bdae4fb172629a76e7) --- docker/keystone/keystone/keystone_bootstrap.sh | 4 +++- releasenotes/notes/bug-1866017-9e31ddbfca9fd0f4.yaml | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/bug-1866017-9e31ddbfca9fd0f4.yaml diff --git a/docker/keystone/keystone/keystone_bootstrap.sh b/docker/keystone/keystone/keystone_bootstrap.sh index e37e383526..15a79c3eb5 100644 --- a/docker/keystone/keystone/keystone_bootstrap.sh +++ b/docker/keystone/keystone/keystone_bootstrap.sh @@ -33,7 +33,9 @@ function exit_json { changed="false" # NOTE(mgoddard): pipe through cat -v to remove unprintable control characters # which prevent JSON decoding. -keystone_bootstrap=$(keystone-manage bootstrap --bootstrap-username "${USERNAME}" --bootstrap-password "${PASSWORD}" --bootstrap-project-name "${PROJECT}" --bootstrap-role-name "${ROLE}" --bootstrap-admin-url "${ADMIN_URL}" --bootstrap-internal-url "${INTERNAL_URL}" --bootstrap-public-url "${PUBLIC_URL}" --bootstrap-service-name "keystone" --bootstrap-region-id "${REGION}" 2>&1 | cat -v) +# NOTE(yoctozepto): also apply sed to escape double quotation marks +# and backslashes +keystone_bootstrap=$(keystone-manage bootstrap --bootstrap-username "${USERNAME}" --bootstrap-password "${PASSWORD}" --bootstrap-project-name "${PROJECT}" --bootstrap-role-name "${ROLE}" --bootstrap-admin-url "${ADMIN_URL}" --bootstrap-internal-url "${INTERNAL_URL}" --bootstrap-public-url "${PUBLIC_URL}" --bootstrap-service-name "keystone" --bootstrap-region-id "${REGION}" 2>&1 | cat -v | sed 's/\\/\\\\/g' | sed 's/"/\\"/g') if [[ $? != 0 ]]; then fail_json "${keystone_bootstrap}" fi diff --git a/releasenotes/notes/bug-1866017-9e31ddbfca9fd0f4.yaml b/releasenotes/notes/bug-1866017-9e31ddbfca9fd0f4.yaml new file mode 100644 index 0000000000..264a56b3eb --- /dev/null +++ b/releasenotes/notes/bug-1866017-9e31ddbfca9fd0f4.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Keystone bootstrap could produce invalid json. + `LP#1866017 `__ From e22fb9796e0592d288310b23bd7245885f235cef Mon Sep 17 00:00:00 2001 From: Rajat Dhasmana Date: Mon, 23 Mar 2020 07:33:03 +0000 Subject: [PATCH 50/51] Add nfs dependencies to glance container Glance API image lacked nfs programs/utils to be able to mount NFS exports. This affected Glance usage with Cinder backend when NFS was used as Cinder backend. Closes-Bug: #1868574 Change-Id: I3aac1e6a7f7c5f839b036f15713af949fba206cc (cherry picked from commit cac9d46aa6dbac6631bdcae67db125a88e1c3234) --- docker/glance/glance-api/Dockerfile.j2 | 9 ++++++--- releasenotes/notes/bug-1868574.yaml | 6 ++++++ 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/bug-1868574.yaml diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 2eff6e383e..e6a972ab43 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -6,11 +6,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% if base_distro in ['centos', 'oraclelinux'] %} - {% set glance_api_packages = ['qemu-img-ev'] %} + {% set glance_api_packages = ['nfs-utils', 'qemu-img-ev'] %} {% elif base_distro == 'rhel' %} - {% set glance_api_packages = ['qemu-img'] %} + {% set glance_api_packages = ['nfs-utils', 'qemu-img'] %} {% elif base_package_type == 'deb' %} - {% set glance_api_packages = ['qemu-utils'] %} + {% set glance_api_packages = [ + 'nfs-common', + 'qemu-utils' + ] %} {% endif %} {{ macros.install_packages(glance_api_packages | customizable("packages")) }} diff --git a/releasenotes/notes/bug-1868574.yaml b/releasenotes/notes/bug-1868574.yaml new file mode 100644 index 0000000000..b23013a414 --- /dev/null +++ b/releasenotes/notes/bug-1868574.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes Glance inability to use Cinder NFS backend for images by including + NFS client components in the Glance API image. + `LP#1868574 `__ From ebfc0a7bf8da8ea27e5a7527859c201dacf7c5e5 Mon Sep 17 00:00:00 2001 From: Dincer Celik Date: Sun, 26 Apr 2020 17:45:02 +0300 Subject: [PATCH 51/51] [rally] Fixes Ubuntu binary This is a follow up for [1]. "rally-manage db" command was deprecated since 0.10.0 but Ubuntu ships 0.9.1 for Bionic. [1] https://bugs.launchpad.net/kolla/+bug/1856693 Closes-Bug: #1872283 Change-Id: I5fb0fc4e6a8bf7ab07abc9c78f0673e3e764b4d1 --- docker/rally/extend_start.sh | 8 +++++++- .../notes/fixes-ubuntu-binary-rally-cf5af7f5d3083c44.yaml | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fixes-ubuntu-binary-rally-cf5af7f5d3083c44.yaml diff --git a/docker/rally/extend_start.sh b/docker/rally/extend_start.sh index 88f3d054f5..6c1de1f11d 100644 --- a/docker/rally/extend_start.sh +++ b/docker/rally/extend_start.sh @@ -10,6 +10,12 @@ fi # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - rally db create || rally db upgrade + # NOTE(osmanlicilegi): "rally-manage db" command was deprecated since 0.10.0 but + # Ubuntu ships 0.9.1 for Bionic. + if [[ ${KOLLA_BASE_DISTRO} == "ubuntu" && ${KOLLA_INSTALL_TYPE} == "binary" ]]; then + rally-manage db create || rally-manage db upgrade + else + rally db create || rally db upgrade + fi exit 0 fi diff --git a/releasenotes/notes/fixes-ubuntu-binary-rally-cf5af7f5d3083c44.yaml b/releasenotes/notes/fixes-ubuntu-binary-rally-cf5af7f5d3083c44.yaml new file mode 100644 index 0000000000..de84c1c491 --- /dev/null +++ b/releasenotes/notes/fixes-ubuntu-binary-rally-cf5af7f5d3083c44.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes Rally for Ubuntu binary deployment. + `LP#1872283 `__