diff --git a/apps/accounts/automations/change_secret/host/aix/main.yml b/apps/accounts/automations/change_secret/host/aix/main.yml
index 4bb571f62..b51ddf69e 100644
--- a/apps/accounts/automations/change_secret/host/aix/main.yml
+++ b/apps/accounts/automations/change_secret/host/aix/main.yml
@@ -9,6 +9,7 @@
name: "{{ account.username }}"
password: "{{ account.secret | password_hash('des') }}"
update_password: always
+ ignore_errors: true
when: account.secret_type == "password"
- name: create user If it already exists, no operation will be performed
diff --git a/apps/accounts/automations/change_secret/host/posix/main.yml b/apps/accounts/automations/change_secret/host/posix/main.yml
index 8dea25c12..80f0aa01c 100644
--- a/apps/accounts/automations/change_secret/host/posix/main.yml
+++ b/apps/accounts/automations/change_secret/host/posix/main.yml
@@ -9,6 +9,7 @@
name: "{{ account.username }}"
password: "{{ account.secret | password_hash('sha512') }}"
update_password: always
+ ignore_errors: true
when: account.secret_type == "password"
- name: create user If it already exists, no operation will be performed
diff --git a/apps/accounts/automations/change_secret/host/windows/main.yml b/apps/accounts/automations/change_secret/host/windows/main.yml
index 66efb0801..86ea7a81f 100644
--- a/apps/accounts/automations/change_secret/host/windows/main.yml
+++ b/apps/accounts/automations/change_secret/host/windows/main.yml
@@ -21,6 +21,7 @@
groups: "{{ user_info.groups[0].name }}"
groups_action: add
update_password: always
+ ignore_errors: true
when: account.secret_type == "password"
- name: Refresh connection
diff --git a/apps/accounts/automations/push_account/host/aix/main.yml b/apps/accounts/automations/push_account/host/aix/main.yml
index 9ac68d20e..7c43c5220 100644
--- a/apps/accounts/automations/push_account/host/aix/main.yml
+++ b/apps/accounts/automations/push_account/host/aix/main.yml
@@ -43,6 +43,7 @@
name: "{{ account.username }}"
password: "{{ account.secret | password_hash('sha512') }}"
update_password: always
+ ignore_errors: true
when: account.secret_type == "password"
- name: remove jumpserver ssh key
diff --git a/apps/accounts/automations/push_account/host/posix/main.yml b/apps/accounts/automations/push_account/host/posix/main.yml
index 9ac68d20e..7c43c5220 100644
--- a/apps/accounts/automations/push_account/host/posix/main.yml
+++ b/apps/accounts/automations/push_account/host/posix/main.yml
@@ -43,6 +43,7 @@
name: "{{ account.username }}"
password: "{{ account.secret | password_hash('sha512') }}"
update_password: always
+ ignore_errors: true
when: account.secret_type == "password"
- name: remove jumpserver ssh key
diff --git a/apps/accounts/automations/push_account/host/windows/main.yml b/apps/accounts/automations/push_account/host/windows/main.yml
index 8a2a0aef0..17f68b660 100644
--- a/apps/accounts/automations/push_account/host/windows/main.yml
+++ b/apps/accounts/automations/push_account/host/windows/main.yml
@@ -17,6 +17,7 @@
groups: "{{ params.groups }}"
groups_action: add
update_password: always
+ ignore_errors: true
when: account.secret_type == "password"
- name: Refresh connection
diff --git a/apps/ops/ansible/callback.py b/apps/ops/ansible/callback.py
index 4bcb9be60..2045b6f29 100644
--- a/apps/ops/ansible/callback.py
+++ b/apps/ops/ansible/callback.py
@@ -1,4 +1,5 @@
from collections import defaultdict
+from functools import reduce
class DefaultCallback:
@@ -18,6 +19,7 @@ class DefaultCallback:
failures=defaultdict(dict),
dark=defaultdict(dict),
skipped=defaultdict(dict),
+ ignored=defaultdict(dict),
)
self.summary = dict(
ok=[],
@@ -59,6 +61,14 @@ class DefaultCallback:
}
self.result['ok'][host][task] = detail
+ def runner_on_skipped(self, event_data, host=None, task=None, **kwargs):
+ detail = {
+ 'action': event_data.get('task_action', ''),
+ 'res': {},
+ 'rc': 0,
+ }
+ self.result['skipped'][host][task] = detail
+
def runner_on_failed(self, event_data, host=None, task=None, res=None, **kwargs):
detail = {
'action': event_data.get('task_action', ''),
@@ -67,15 +77,9 @@ class DefaultCallback:
'stdout': res.get('stdout', ''),
'stderr': ';'.join([res.get('stderr', ''), res.get('msg', '')]).strip(';')
}
- self.result['failures'][host][task] = detail
-
- def runner_on_skipped(self, event_data, host=None, task=None, **kwargs):
- detail = {
- 'action': event_data.get('task_action', ''),
- 'res': {},
- 'rc': 0,
- }
- self.result['skipped'][host][task] = detail
+ ignore_errors = event_data.get('ignore_errors', False)
+ error_key = 'ignored' if ignore_errors else 'failures'
+ self.result[error_key][host][task] = detail
def runner_on_unreachable(self, event_data, host=None, task=None, res=None, **kwargs):
detail = {
@@ -106,13 +110,18 @@ class DefaultCallback:
def playbook_on_stats(self, event_data, **kwargs):
failed = []
- for i in ['dark', 'failures']:
- for host, tasks in self.result[i].items():
+ error_func = lambda err, task_detail: err + f"{task_detail[0]}: {task_detail[1]['stderr']};"
+ for tp in ['dark', 'failures']:
+ for host, tasks in self.result[tp].items():
failed.append(host)
- error = ''
- for task, detail in tasks.items():
- error += f'{task}: {detail["stderr"]};'
- self.summary[i][host] = error.strip(';')
+ error = reduce(error_func, tasks.items(), '').strip(';')
+ self.summary[tp][host] = error
+
+ for host, tasks in self.result.get('ignored', {}).items():
+ ignore_errors = reduce(error_func, tasks.items(), '').strip(';')
+ if host in failed:
+ self.summary['failures'][host] += {ignore_errors}
+
self.summary['ok'] = list(set(self.result['ok'].keys()) - set(failed))
self.summary['skipped'] = list(set(self.result['skipped'].keys()) - set(failed))