diff --git a/apps/accounts/automations/gather_accounts/manager.py b/apps/accounts/automations/gather_accounts/manager.py index 848423164..5be1f423b 100644 --- a/apps/accounts/automations/gather_accounts/manager.py +++ b/apps/accounts/automations/gather_accounts/manager.py @@ -1,7 +1,7 @@ -from orgs.utils import tmp_to_org -from common.utils import get_logger +from accounts.const import AutomationTypes from accounts.models import GatheredAccount -from accounts.const import AutomationTypes, Source +from common.utils import get_logger +from orgs.utils import tmp_to_org from .filter import GatherAccountsFilter from ..base.manager import AccountBasePlaybookManager diff --git a/apps/assets/automations/base/manager.py b/apps/assets/automations/base/manager.py index 52b915670..518008d26 100644 --- a/apps/assets/automations/base/manager.py +++ b/apps/assets/automations/base/manager.py @@ -241,7 +241,6 @@ class BasePlaybookManager: print(">>> 开始执行任务\n") else: print("### 没有需要执行的任务\n") - return self.execution.date_start = timezone.now() for i, runner in enumerate(runners, start=1): diff --git a/apps/assets/const/database.py b/apps/assets/const/database.py index 7bf1aaf44..86e86ed40 100644 --- a/apps/assets/const/database.py +++ b/apps/assets/const/database.py @@ -38,9 +38,21 @@ class DatabaseTypes(BaseType): }, cls.REDIS: { 'ansible_enabled': False, + 'ping_enabled': False, + 'gather_facts_enabled': False, + 'gather_accounts_enabled': False, + 'verify_account_enabled': False, + 'change_secret_enabled': False, + 'push_account_enabled': False, }, cls.CLICKHOUSE: { 'ansible_enabled': False, + 'ping_enabled': False, + 'gather_facts_enabled': False, + 'gather_accounts_enabled': False, + 'verify_account_enabled': False, + 'change_secret_enabled': False, + 'push_account_enabled': False, }, } return constrains diff --git a/apps/assets/const/host.py b/apps/assets/const/host.py index a2e99865e..e7abba3fc 100644 --- a/apps/assets/const/host.py +++ b/apps/assets/const/host.py @@ -63,7 +63,13 @@ class HostTypes(BaseType): }, }, cls.OTHER_HOST: { - 'ansible_enabled': False + 'ansible_enabled': False, + 'ping_enabled': False, + 'gather_facts_enabled': False, + 'gather_accounts_enabled': False, + 'verify_account_enabled': False, + 'change_secret_enabled': False, + 'push_account_enabled': False }, }