diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2020-01-29 17:31:06 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2020-01-29 17:34:26 +0100 |
| commit | 1c2b1de8cda572e5462113220206f0d934ac5f96 (patch) | |
| tree | 0777d845318f33fc20d4593e48afe972ec3bcfa1 /mcp/patches/salt-formula-maas/0005-Implement-tags-support.patch | |
| parent | 03b837ba6d5ffe38d7641af02518f5b09ce8784f (diff) | |
maas: Avoid race condition in node fixups
When more than one node enters a failure state during a deploy attempt,
we recover the first one and issue another deploy request; avoid raising
an exception for the second node (which is not in 'Ready' state either),
allowing the retries to continue.
Change-Id: I4a3e037e78b5c48aebf6e700115c0bbf848c7cd5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/patches/salt-formula-maas/0005-Implement-tags-support.patch')
| -rw-r--r-- | mcp/patches/salt-formula-maas/0005-Implement-tags-support.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mcp/patches/salt-formula-maas/0005-Implement-tags-support.patch b/mcp/patches/salt-formula-maas/0005-Implement-tags-support.patch index e59c2f2e8..09d21d022 100644 --- a/mcp/patches/salt-formula-maas/0005-Implement-tags-support.patch +++ b/mcp/patches/salt-formula-maas/0005-Implement-tags-support.patch @@ -34,7 +34,7 @@ index 78d8aef..8c35458 100644 # domain: mydomain.local # This function broken http_proxy: http://192.168.0.10:3142 diff --git a/_modules/maas.py b/_modules/maas.py -index 28e46c5..f56ed34 100644 +index bb70576..0cda8dd 100644 --- a/_modules/maas.py +++ b/_modules/maas.py @@ -876,6 +876,28 @@ class Domain(MaasObject): @@ -66,7 +66,7 @@ index 28e46c5..f56ed34 100644 class MachinesStatus(MaasObject): @classmethod def execute(cls, objects_name=None): -@@ -1064,5 +1086,9 @@ def process_sshprefs(): +@@ -1065,5 +1087,9 @@ def process_sshprefs(): return SSHPrefs().process() |