23a2b557f1
This reverts commit 129d958a51.
Reason for revert: reverting back to 2.8.7 to modify chart
Change-Id: I68d3abfb19decc5eb470fcf43694506bc5edd4b6
22 lines
910 B
Diff
22 lines
910 B
Diff
diff --git a/src/maasserver/security.py b/src/maasserver/security.py
|
|
index f92529265..542970009 100644
|
|
--- a/src/maasserver/security.py
|
|
+++ b/src/maasserver/security.py
|
|
@@ -97,11 +97,11 @@ def get_shared_secret_txn():
|
|
elif secret_in_db == secret_on_fs:
|
|
secret = secret_in_db # or secret_on_fs.
|
|
else:
|
|
- raise AssertionError(
|
|
- "The secret stored in the database does not match the secret "
|
|
- "stored on the filesystem at %s. Please investigate."
|
|
- % get_shared_secret_filesystem_path()
|
|
- )
|
|
+ # (nk613n): When we rotate secrets we only update the filesystem
|
|
+ # so if the secrets don't match we will default to the FS
|
|
+ # secret and set it in the database (set_config function)
|
|
+ secret = secret_on_fs
|
|
+ Config.objects.set_config("rpc_shared_secret", to_hex(secret))
|
|
|
|
return secret
|
|
|