d6d9b4c857
This change renames the various patch files to reflect that they are based on diffs against MAAS 2.8. Files that were previously listed as 2.3_*.patch originally were created against MAAS 2.3, but this is not particularly relevant anymore. Change-Id: I93ca4fc414f0983be62f0a8bae8ec699f3d4e7a0
28 lines
1012 B
Diff
28 lines
1012 B
Diff
diff --git a/src/provisioningserver/drivers/power/ipmi.py b/src/provisioningserver/drivers/power/ipmi.py
|
|
index e99b807ce..8f56dc77a 100644
|
|
--- a/src/provisioningserver/drivers/power/ipmi.py
|
|
+++ b/src/provisioningserver/drivers/power/ipmi.py
|
|
@@ -154,6 +154,13 @@ IPMI_ERRORS = {
|
|
),
|
|
"exception": PowerConnError,
|
|
},
|
|
+ "BMC error": {
|
|
+ "message": (
|
|
+ "Device not responding correctly while performing power action."
|
|
+ " MAAS performed several retries. Please wait and try again."
|
|
+ ),
|
|
+ "exception": PowerConnError,
|
|
+ },
|
|
"could not find inband device": {
|
|
"message": (
|
|
"An inband device could not be found."
|
|
@@ -231,7 +238,7 @@ class IPMIPowerDriver(PowerDriver):
|
|
),
|
|
]
|
|
ip_extractor = make_ip_extractor("power_address")
|
|
- wait_time = (4, 8, 16, 32)
|
|
+ wait_time = (4, 4, 8, 8, 16, 16, 32, 32)
|
|
|
|
def detect_missing_packages(self):
|
|
if not shell.has_command_available("ipmipower"):
|