b648edfe40
Image changes: * base image ubuntu:18.04 * MAAS version 2.8.6-8602-g.07cdffcaa-0ubuntu1~18.04.1 from ppa/2.8 * default contents of /var/lib/maas are archived in /opt/maas * updated patches: - 2.3_bios_grub_partition.patch, changed in maas [0] - 2.3_partitiontable_does_not_exist.patch, changed in maas [1] [2] - 2.3_secure_headers.patch, updated for twisted 17.9.0 [3] * removed patches: - 2.3_bios_grub_preseed.patch, changed in maas, now N/A [0] - 2.3_hostheader.patch, fixed in maas [4] - 2.3_maas_enlist.patch, fixed in maas [5] - 2.3_mac_address.patch, fixed in maas [6] * new patches: - 2.8_maas_ipmi_autodetect_tool.patch, enlistment reliability * reformatted patches due to blackening change [1]: - 2.3_configure_ipmi_user.patch - 2.3_ipmi_error.patch - 2.3_kernel_package.patch, custom req to specify kernel package - 2.3_nic_filter.patch, custom req to ignore cali* interfaces - 2.3_region_secret_rotate.patch - 2.3_route.patch Chart changes: * maas-region podport is 5240 * maas config option http_boot is no longer configurable [7] * start script restores some default files into /var/lib/maas * register-rack-controller script removes old files in /etc/maas * enlist userdata now matches commissioning/curtin userdata [8] * force_gpt option is removed [9], as GPT is now the default * update to configure remote_syslog in import resources job [10] * enlist_commissioning is disabled for backwards compatibility [11] 0:d8e234eb091:db30bb39fa2:665feb75753: https://github.com/twisted/twisted/blob/twisted-17.9.0/src/twisted/web/server.py 4:573da697295:d390a1da6a6:34631c2fe57:0e94c26a538:22641cffcc9:97c25a048610:d67c359c7b11:51b9712c20Change-Id: I0685d76cf083ff5aa33c8db552059721289d5c53
60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
diff --git a/src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py b/src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py
|
|
index 13188ecb8..7b3dad4d4 100755
|
|
--- a/src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py
|
|
+++ b/src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py
|
|
@@ -235,8 +235,30 @@ def make_ipmi_user_settings(username, password):
|
|
return user_settings
|
|
|
|
|
|
+def configure_ipmi_user_with_backoff(username):
|
|
+ """Create/configure an IPMI user, but with several tries"""
|
|
+ attempt = 1
|
|
+ max_attempts = 5
|
|
+ backoff_amount = 30
|
|
+ while attempt <= max_attempts:
|
|
+ password = None
|
|
+ try:
|
|
+ password = configure_ipmi_user(username)
|
|
+ except:
|
|
+ if (attempt + 1) > max_attempts:
|
|
+ # This is our last attempt, don't catch anything:
|
|
+ raise
|
|
+
|
|
+ if password is None:
|
|
+ time.sleep(attempt * backoff_amount)
|
|
+ else:
|
|
+ return password
|
|
+ attempt += 1
|
|
+
|
|
+
|
|
def configure_ipmi_user(username):
|
|
"""Create or configure an IPMI user for remote use."""
|
|
+ exceptions_caught = []
|
|
for password in [
|
|
generate_random_password(),
|
|
generate_random_password(with_special_chars=True),
|
|
@@ -245,9 +267,11 @@ def configure_ipmi_user(username):
|
|
try:
|
|
apply_ipmi_user_settings(user_settings)
|
|
return password
|
|
- except subprocess.CalledProcessError:
|
|
- pass
|
|
- raise IPMIError("Unable to set BMC password.")
|
|
+ except subprocess.CalledProcessError as e:
|
|
+ exceptions_caught.append(e)
|
|
+ raise IPMIError(
|
|
+ "Unable to set BMC password:\n{}".format(exceptions_caught)
|
|
+ )
|
|
|
|
|
|
def set_ipmi_lan_channel_settings():
|
|
@@ -389,7 +413,7 @@ def main():
|
|
IPMI_MAAS_USER = args.maas_ipmi_user
|
|
IPMI_MAAS_PASSWORD = None
|
|
|
|
- IPMI_MAAS_PASSWORD = configure_ipmi_user(IPMI_MAAS_USER)
|
|
+ IPMI_MAAS_PASSWORD = configure_ipmi_user_with_backoff(IPMI_MAAS_USER)
|
|
|
|
# Attempt to enable IPMI Over Lan. If it is disabled, MAAS won't
|
|
# be able to remotely communicate to the BMC.
|