From 1930c58160cde944f3ba936911af75ea71386128 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Thu, 11 Nov 2021 19:36:25 +0530 Subject: [PATCH] Drop non-ASCII character from manila config Noticed the issue with packstack deployment on CentOS 9-Stream[1]. The issue is raised by puppet when non-utf8 encoding is used like LANG=en_US or LANG=C. Other option is to force LANG=en_US.UTF-8 with the deployment but just for this description help(all other services working fine), doesn't look good so proposing to drop that non-ASCII character. Issue got caught in CentOS 9-Stream only as it disabled locale forwarding in OpenSSH by default[2]. [1] https://review.opendev.org/c/x/packstack/+/816796 [2] https://bugzilla.redhat.com/show_bug.cgi?id=2002734 Change-Id: Ia99cc5313bed950e3363ae311b741395d60eb57b (cherry picked from commit 5bf206285de3aa61b56ee6c83ffd36e9c1617860) (cherry picked from commit 0fb10e6c5db11f2a980819db476d3fda80f521a2) (cherry picked from commit c034ed19ff7bafccd15d5afa000c30632d572ca3) (cherry picked from commit deaa1bf16ac1ac6f77220b8f08759d7b262e8305) (cherry picked from commit ecc38d829f4ceac7070332f08fb4a2aa7399039f) --- manila/share/drivers/netapp/options.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manila/share/drivers/netapp/options.py b/manila/share/drivers/netapp/options.py index aa2e56be14..6ef56face8 100644 --- a/manila/share/drivers/netapp/options.py +++ b/manila/share/drivers/netapp/options.py @@ -47,13 +47,13 @@ netapp_transport_opts = [ 'the storage system or proxy server. Valid values are ' 'http or https.')), cfg.StrOpt('netapp_ssl_cert_path', - help=('The path to a CA_BUNDLE file or directory with ' - 'certificates of trusted CA. If set to a directory, it ' - 'must have been processed using the c_rehash utility ' - 'supplied with OpenSSL. If not informed, it will use the ' - 'Mozilla\'s carefully curated collection of Root ' - 'Certificates for validating the trustworthiness of SSL ' - 'certificates.')), ] + help=("The path to a CA_BUNDLE file or directory with " + "certificates of trusted CA. If set to a directory, it " + "must have been processed using the c_rehash utility " + "supplied with OpenSSL. If not informed, it will use the " + "Mozilla's carefully curated collection of Root " + "Certificates for validating the trustworthiness of SSL " + "certificates.")), ] netapp_basicauth_opts = [ cfg.StrOpt('netapp_login',