Merge ~bjornt/maas:bug-2073731-hotfix into maas:branch-3.4.3-hotfix-bug-2073731

Proposed by Björn Tillenius
Status: Merged
Approved by: Björn Tillenius
Approved revision: 375b1f4cb7be4d619c68e82bf87b86cfca336d3d
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~bjornt/maas:bug-2073731-hotfix
Merge into: maas:branch-3.4.3-hotfix-bug-2073731
Diff against target: 30 lines (+5/-3)
2 files modified
src/maasserver/tests/test_node_action.py (+1/-1)
src/metadataserver/builtin_scripts/commissioning_scripts/bmc_config.py (+4/-2)
Reviewer Review Type Date Requested Status
MAAS Lander Needs Fixing
Jack Lloyd-Walters Approve
Jerzy Husakowski Approve
Björn Tillenius Approve
Review via email: mp+470163@code.launchpad.net

Commit message

fix: don't fail commissioning if no suitable IPMI ciphers can be detected

Some BMCs (like HPE ILO 5 3.05) seems to not report all the ciphers
that actually are enabled.

Instead of failing commissioning, we now only print out a warning.

Resolves LP:2073731

To post a comment you must log in.
Revision history for this message
Björn Tillenius (bjornt) wrote :

Self-approve, so we can get this tested quickly.

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :
Revision history for this message
Jerzy Husakowski (jhusakowski) :
review: Approve
Revision history for this message
Jack Lloyd-Walters (lloydwaltersj) wrote :

jenkins: !test

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b bug-2073731-hotfix lp:~bjornt/maas/+git/maas into -b branch-3.4.3-hotfix-bug-2073731 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/6137/console
COMMIT: b4d06ee779fafcdb8c1d69e1809067ff594b00b1

review: Needs Fixing
Revision history for this message
Jack Lloyd-Walters (lloydwaltersj) :
review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :
Revision history for this message
Jack Lloyd-Walters (lloydwaltersj) wrote :

jenkins: !test

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b bug-2073731-hotfix lp:~bjornt/maas/+git/maas into -b branch-3.4.3-hotfix-bug-2073731 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/6141/console
COMMIT: b4d06ee779fafcdb8c1d69e1809067ff594b00b1

review: Needs Fixing
~bjornt/maas:bug-2073731-hotfix updated
375b1f4... by Björn Tillenius

test: fix intermitten test_Commission_starts_commissioning failure

The test assumed a certain ordering of the ids, but relied
on postgres default ordering.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/tests/test_node_action.py b/src/maasserver/tests/test_node_action.py
2index 4593e3b..1ac9f14 100644
3--- a/src/maasserver/tests/test_node_action.py
4+++ b/src/maasserver/tests/test_node_action.py
5@@ -396,7 +396,7 @@ class TestCommissionAction(MAASServerTestCase):
6 action.execute(
7 testing_scripts=testing_scripts, script_input=script_input
8 )
9- script_sets = ScriptSet.objects.all()
10+ script_sets = ScriptSet.objects.all().order_by("id")
11 node = reload_object(node)
12 self.assertEqual(2, len(script_sets))
13 self.assertEqual(
14diff --git a/src/metadataserver/builtin_scripts/commissioning_scripts/bmc_config.py b/src/metadataserver/builtin_scripts/commissioning_scripts/bmc_config.py
15index cfaa80d..cea099f 100755
16--- a/src/metadataserver/builtin_scripts/commissioning_scripts/bmc_config.py
17+++ b/src/metadataserver/builtin_scripts/commissioning_scripts/bmc_config.py
18@@ -553,8 +553,10 @@ class IPMI(IPMIBase):
19 # this one.
20
21 if not self._check_ciphers_enabled():
22- print("ERROR: No cipher enabled!", file=sys.stderr)
23- sys.exit(1)
24+ # We can't detect any suitable cipher. We still continue,
25+ # since we don't trust that the BMC reports all the
26+ # ciphers that actually are usable.
27+ print("WARNING: No cipher enabled!", file=sys.stderr)
28
29 self._config_ipmi_lan_channel_settings()
30 self._config_lan_conf_auth()

Subscribers

People subscribed via source and target branches