github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: 优化发布机的注册名称，避免重复

pull/11310/head
Eric 2023-08-17 10:33:59 +08:00
parent 9317d9e35e
commit bbd36fea03
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/terminal/automations/deploy_applet_host/__init__.py
View File

@ -6,7 +6,7 @@ from django.conf import settings
from django.utils import timezone from django.utils import timezone
from common.db.utils import safe_db_connection from common.db.utils import safe_db_connection
from common.utils import get_logger from common.utils import get_logger, random_string
from ops.ansible import PlaybookRunner, JMSInventory from ops.ansible import PlaybookRunner, JMSInventory
from terminal.models import Applet, AppletHostDeployment from terminal.models import Applet, AppletHostDeployment
@ -58,13 +58,15 @@ class DeployAppletHostManager:
download_host = download_host.rstrip("/") download_host = download_host.rstrip("/")
def handler(plays): def handler(plays):
applet_host_name = self.deployment.host.name
hostname = '{}-{}'.format(applet_host_name, random_string(7))
for play in plays: for play in plays:
play["vars"].update(options) play["vars"].update(options)
play["vars"]["APPLET_DOWNLOAD_HOST"] = download_host play["vars"]["APPLET_DOWNLOAD_HOST"] = download_host
play["vars"]["CORE_HOST"] = core_host play["vars"]["CORE_HOST"] = core_host
play["vars"]["BOOTSTRAP_TOKEN"] = bootstrap_token play["vars"]["BOOTSTRAP_TOKEN"] = bootstrap_token
play["vars"]["HOST_ID"] = host_id play["vars"]["HOST_ID"] = host_id
play["vars"]["HOST_NAME"] = self.deployment.host.name play["vars"]["HOST_NAME"] = hostname
return plays return plays
return self._generate_playbook("playbook.yml", handler) return self._generate_playbook("playbook.yml", handler)