Browse Source

v6.3.12.0

Changelog: https://roxy-wi.org/changelog#6_3_12
pull/364/head
Aidaho 2 years ago
parent
commit
d25cfef618
  1. 2
      app/create_db.py
  2. 1
      app/modules/provisioning/do.py
  3. 2
      app/modules/provisioning/server.py

2
app/create_db.py

@ -819,7 +819,7 @@ def update_db_v_6_3_11():
def update_db_v_6_3_12():
try:
ProvisionParam.delete().where(
(ProvisionParam.provider == 'gcore') *
(ProvisionParam.provider == 'gcore') &
(ProvisionParam.optgroup == 'Russia and CIS')
).execute()
except Exception as e:

1
app/modules/provisioning/do.py

@ -54,7 +54,6 @@ def edit_workspace() -> None:
workspace = form.getvalue('doeditworkspace')
group = form.getvalue('do_edit_group')
provider = form.getvalue('do_edit_provider')
region = form.getvalue('do_edit_regions')
size = form.getvalue('do_edit_size')
oss = form.getvalue('do_edit_oss')
ssh_name = form.getvalue('do_edit_ssh_name')

2
app/modules/provisioning/server.py

@ -65,7 +65,7 @@ def create_server() -> None:
output, stderr = server_mod.subprocess_execute(cmd)
if stderr != '':
prov_common.show_error(stderr, group, workspace, provider)
prov_common.show_error(stderr, group, workspace, provider_id)
else:
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}"'

Loading…
Cancel
Save