From 308077155951ce9d0fcf67a985fd91bd08ea9920 Mon Sep 17 00:00:00 2001 From: jiangweidong <80373698+Hi-JWD@users.noreply.github.com> Date: Thu, 2 Feb 2023 10:32:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=B2=A1=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=88=B0=E8=AF=81=E4=B9=A6=E7=9A=84mongodb=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E6=97=A0=E6=B3=95=E6=89=A7=E8=A1=8C=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E4=BB=BB=E5=8A=A1=20(#9399)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/automations/base/manager.py | 4 ++-- apps/ops/ansible/inventory.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/assets/automations/base/manager.py b/apps/assets/automations/base/manager.py index f9d06bb73..6247c85d7 100644 --- a/apps/assets/automations/base/manager.py +++ b/apps/assets/automations/base/manager.py @@ -73,7 +73,7 @@ class BasePlaybookManager: if not path_dir: return host - specific = host.get('jms_asset', {}).get('specific', {}) + specific = host.get('jms_asset', {}).get('secret_info', {}) cert_fields = ('ca_cert', 'client_key', 'client_cert') filtered = list(filter(lambda x: specific.get(x), cert_fields)) if not filtered: @@ -87,7 +87,7 @@ class BasePlaybookManager: result = self.write_cert_to_file( os.path.join(cert_dir, f), specific.get(f) ) - host['jms_asset']['specific'][f] = result + host['jms_asset']['secret_info'][f] = result return host def host_callback(self, host, automation=None, **kwargs): diff --git a/apps/ops/ansible/inventory.py b/apps/ops/ansible/inventory.py index 0a3ce43af..a340b510d 100644 --- a/apps/ops/ansible/inventory.py +++ b/apps/ops/ansible/inventory.py @@ -105,7 +105,7 @@ class JMSInventory: 'id': str(asset.id), 'name': asset.name, 'address': asset.address, 'type': asset.type, 'category': asset.category, 'protocol': asset.protocol, 'port': asset.port, - 'spec_info': asset.spec_info, + 'spec_info': asset.spec_info, 'secret_info': asset.secret_info, 'protocols': [{'name': p.name, 'port': p.port} for p in protocols], }, 'jms_account': {