Fixes in create server
This commit is contained in:
parent
7fe9966808
commit
eca40523d0
1 changed files with 12 additions and 14 deletions
|
|
@ -238,7 +238,6 @@ def pastafari2_add_server_task():
|
|||
group_name=arr_group['code_group']
|
||||
|
||||
|
||||
|
||||
data={'ssh_user': ssh_user, 'pub_key': public_key, 'hostname': server_host, 'ip': ip, 'group_id': group_id, 'group_name': group_name}
|
||||
|
||||
with SSHTask(server_host, db, remote_user=server_username, remote_password=server_password, private_key=private_key, remote_path=remote_path, task_id=task_id, data=data, port=ssh_port) as ssh_task:
|
||||
|
|
@ -248,21 +247,20 @@ def pastafari2_add_server_task():
|
|||
error_form['#server_host_error']=txt_error #_('Error: cannot connect to server')
|
||||
else:
|
||||
# Prepare task for install monit
|
||||
pass
|
||||
|
||||
task=Task(db)
|
||||
|
||||
task=Task(db)
|
||||
|
||||
task_id=0
|
||||
|
||||
path_task='modules.pastafari2.tasks.system.task'
|
||||
|
||||
if not task.run_task(ip, path_task, 'Add new server', 'add_new_server', 'Task for add a new server', user=server_username, password=server_password, where_sql_server='', url='', data=data, send_task=True, ssh_port=ssh_port):
|
||||
task_id=0
|
||||
|
||||
error=1
|
||||
error_form['#server_host_error']=_('Error: cannot execute the task ')+task.txt_error
|
||||
txt_error=_('Error: cannot execute the task ')+task.txt_error
|
||||
|
||||
task_id=task.task_id
|
||||
path_task='modules.pastafari2.tasks.system.task'
|
||||
|
||||
if not task.run_task(ip, path_task, 'Add new server', 'add_new_server', 'Task for add a new server', user=server_username, password=server_password, where_sql_server='', url='', data=data, send_task=True, ssh_port=ssh_port):
|
||||
|
||||
error=1
|
||||
error_form['#server_host_error']=_('Error: cannot execute the task ')+task.txt_error
|
||||
txt_error=_('Error: cannot execute the task ')+task.txt_error
|
||||
|
||||
task_id=task.task_id
|
||||
|
||||
return {'error': error, 'txt_error': txt_error, 'error_form': error_form, 'task_id': task_id}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue