Reviewed: https://review.opendev.org/685738 Committed: https://git.openstack.org/cgit/openstack/kolla/commit/?id=33e170d3b5a2f4cf5896da1f96bc8c133ee3c388 Submitter: Zuul Branch: stable/queens
commit 33e170d3b5a2f4cf5896da1f96bc8c133ee3c388 Author: Mark Goddard <email address hidden> Date: Fri Sep 27 14:12:55 2019 +0100
Fix fluentd and sensu images
1. fluentd on Ubuntu - pin faraday to <0.16
Rocky and earlier only.
Faraday 0.16.x depends on Ruby 2.3+, but td-agent on Ubuntu uses its own old version of Ruby.
This change pins faraday in the Ubuntu and Debian fluentd images to versions earlier than 0.16.
2. sensu-client: Pin minitest Ruby gem on CentOS
This was originally in change I1afd2d50c0dc2de6d305b56bd5f9182745fee843 on master and stable/stein.
(cherry picked from commit 305312f1070e80ba849f8c4feb00ad02196b8306)
Change-Id: Id9a76f459aff016fbc920370c0a3ec58e0397fcb Closes-Bug: #1845647 Closes-Bug: #1845705 Closes-bug: #1845843 (cherry picked from commit a0712ceef3d6c20cdd79417dcff10525c527fb3d)
Reviewed: https:/ /review. opendev. org/685738 /git.openstack. org/cgit/ openstack/ kolla/commit/ ?id=33e170d3b5a 2f4cf5896da1f96 bc8c133ee3c388
Committed: https:/
Submitter: Zuul
Branch: stable/queens
commit 33e170d3b5a2f4c f5896da1f96bc8c 133ee3c388
Author: Mark Goddard <email address hidden>
Date: Fri Sep 27 14:12:55 2019 +0100
Fix fluentd and sensu images
1. fluentd on Ubuntu - pin faraday to <0.16
Rocky and earlier only.
Faraday 0.16.x depends on Ruby 2.3+, but td-agent on Ubuntu uses its own
old version of Ruby.
This change pins faraday in the Ubuntu and Debian fluentd images to
versions earlier than 0.16.
2. sensu-client: Pin minitest Ruby gem on CentOS
This was originally in change I1afd2d50c0dc2d e6d305b56bd5f91 82745fee843
on master and stable/stein.
(cherry picked from commit 305312f1070e80b a849f8c4feb00ad 02196b8306)
Change-Id: Id9a76f459aff01 6fbc920370c0a3e c58e0397fcb cdd79417dcff105 25c527fb3d)
Closes-Bug: #1845647
Closes-Bug: #1845705
Closes-bug: #1845843
(cherry picked from commit a0712ceef3d6c20