Merge ~troyanov/maas:backport-95705c9-3.5 into maas:3.5

Proposed by Anton Troyanov
Status: Merged
Approved by: Anton Troyanov
Approved revision: ec806971f02c3f7bc701e5f1ff80a16d8810a693
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~troyanov/maas:backport-95705c9-3.5
Merge into: maas:3.5
Diff against target: 26 lines (+2/-2)
2 files modified
src/provisioningserver/drivers/power/redfish.py (+1/-1)
src/provisioningserver/drivers/power/tests/test_redfish.py (+1/-1)
Reviewer Review Type Date Requested Status
Anton Troyanov Approve
Review via email: mp+462761@code.launchpad.net

Commit message

fix: MAAS Redfish doesn't reboot Cisco UCS C-series appliance

Resolves LP:2028000

(cherry picked from commit 95705c9a4d264efe85e472629065b59b714ee0c6)

To post a comment you must log in.
Revision history for this message
Anton Troyanov (troyanov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/provisioningserver/drivers/power/redfish.py b/src/provisioningserver/drivers/power/redfish.py
2index d7e781c..e46d930 100644
3--- a/src/provisioningserver/drivers/power/redfish.py
4+++ b/src/provisioningserver/drivers/power/redfish.py
5@@ -61,7 +61,7 @@ class RedfishPowerDriverBase(PowerDriver):
6 b"User-Agent": [b"MAAS"],
7 b"Accept": [b"application/json"],
8 b"Authorization": [b"Basic " + authorization],
9- b"Content-Type": [b"application/json; charset=utf-8"],
10+ b"Content-Type": [b"application/json"],
11 }
12 )
13
14diff --git a/src/provisioningserver/drivers/power/tests/test_redfish.py b/src/provisioningserver/drivers/power/tests/test_redfish.py
15index fa1251c..d0e44d5 100644
16--- a/src/provisioningserver/drivers/power/tests/test_redfish.py
17+++ b/src/provisioningserver/drivers/power/tests/test_redfish.py
18@@ -202,7 +202,7 @@ class TestRedfishPowerDriver(MAASTestCase):
19 b"User-Agent": [b"MAAS"],
20 b"Accept": [b"application/json"],
21 b"Authorization": [b"Basic " + authorization],
22- b"Content-Type": [b"application/json; charset=utf-8"],
23+ b"Content-Type": [b"application/json"],
24 }
25 driver = RedfishPowerDriver()
26 headers = driver.make_auth_headers(power_user, power_pass)

Subscribers

People subscribed via source and target branches