From ac958698d0e29cc0bc4bbad4476fc7bc01ed870d Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Wed, 5 Jan 2022 16:23:46 -0500 Subject: [PATCH] Only set chap algorithms if not openeuler For some reason, setting the CHAPAlgorithms as in c3b705138 breaks OpenEuler. Making this conditional so that tests continue to pass. Change-Id: Iaa740ecfbb9173dd97e90485bad88225caedb523 --- lib/nova | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/nova b/lib/nova index 5a12da6731..4f98d4d52c 100644 --- a/lib/nova +++ b/lib/nova @@ -320,8 +320,12 @@ EOF fi # set chap algorithms. The default chap_algorithm is md5 which will - # not work under FIPS - iniset -sudo /etc/iscsi/iscsid.conf DEFAULT "node.session.auth.chap_algs" "SHA3-256,SHA256" + # not work under FIPS. + # FIXME(alee) For some reason, this breaks openeuler. Openeuler devs should weigh in + # and determine the correct solution for openeuler here + if ! is_openeuler; then + iniset -sudo /etc/iscsi/iscsid.conf DEFAULT "node.session.auth.chap_algs" "SHA3-256,SHA256" + fi # ensure that iscsid is started, even when disabled by default restart_service iscsid