mirror of https://github.com/Aidaho12/haproxy-wi
parent
08e415c3da
commit
d25cfef618
|
@ -819,7 +819,7 @@ def update_db_v_6_3_11():
|
||||||
def update_db_v_6_3_12():
|
def update_db_v_6_3_12():
|
||||||
try:
|
try:
|
||||||
ProvisionParam.delete().where(
|
ProvisionParam.delete().where(
|
||||||
(ProvisionParam.provider == 'gcore') *
|
(ProvisionParam.provider == 'gcore') &
|
||||||
(ProvisionParam.optgroup == 'Russia and CIS')
|
(ProvisionParam.optgroup == 'Russia and CIS')
|
||||||
).execute()
|
).execute()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|
|
@ -54,7 +54,6 @@ def edit_workspace() -> None:
|
||||||
workspace = form.getvalue('doeditworkspace')
|
workspace = form.getvalue('doeditworkspace')
|
||||||
group = form.getvalue('do_edit_group')
|
group = form.getvalue('do_edit_group')
|
||||||
provider = form.getvalue('do_edit_provider')
|
provider = form.getvalue('do_edit_provider')
|
||||||
region = form.getvalue('do_edit_regions')
|
|
||||||
size = form.getvalue('do_edit_size')
|
size = form.getvalue('do_edit_size')
|
||||||
oss = form.getvalue('do_edit_oss')
|
oss = form.getvalue('do_edit_oss')
|
||||||
ssh_name = form.getvalue('do_edit_ssh_name')
|
ssh_name = form.getvalue('do_edit_ssh_name')
|
||||||
|
|
|
@ -65,7 +65,7 @@ def create_server() -> None:
|
||||||
output, stderr = server_mod.subprocess_execute(cmd)
|
output, stderr = server_mod.subprocess_execute(cmd)
|
||||||
|
|
||||||
if stderr != '':
|
if stderr != '':
|
||||||
prov_common.show_error(stderr, group, workspace, provider)
|
prov_common.show_error(stderr, group, workspace, provider_id)
|
||||||
else:
|
else:
|
||||||
if cloud == 'aws':
|
if cloud == 'aws':
|
||||||
cmd = 'cd scripts/terraform/ && sudo terraform state show module.aws_module.aws_eip.floating_ip[0]|grep -Eo "[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}"'
|
cmd = 'cd scripts/terraform/ && sudo terraform state show module.aws_module.aws_eip.floating_ip[0]|grep -Eo "[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}"'
|
||||||
|
|
Loading…
Reference in New Issue