autonomic-cooperative/capsul-flask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

move hardcoding public3 to the right place

Browse Source
This commit is contained in:
forest 2021-07-12 16:10:28 -05:00
parent 6e6bd2b143
commit 908d02803f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
capsulflask/hub_api.py
View File

@ -160,21 +160,22 @@ def can_claim_create(payload, host_id) -> (str, str):
if allocated_network_name is None or allocated_ipv4_address is None: if allocated_network_name is None or allocated_ipv4_address is None:
return "", f"host \"{host_id}\" does not have any avaliable IP addresses on any of its networks." return "", f"host \"{host_id}\" does not have any avaliable IP addresses on any of its networks."
payload["network_name"] = allocated_network_name # payload["network_name"] = allocated_network_name
# hard-code the network name for now until we can fix the phantom dhcp lease issues.
payload["network_name"] = 'public3'
payload["public_ipv4"] = allocated_ipv4_address payload["public_ipv4"] = allocated_ipv4_address
return payload, "" return payload, ""
def on_create_claimed(payload, host_id): def on_create_claimed(payload, host_id):
# network_name=payload['network_name'],
# hard-code the network name for now until we can fix the phantom dhcp lease issues.
get_model().create_vm( get_model().create_vm(
email=payload['email'], email=payload['email'],
id=payload['id'], id=payload['id'],
size=payload['size'], size=payload['size'],
os=payload['os'], os=payload['os'],
host=host_id, host=host_id,
network_name='public3', network_name=payload['network_name'],
public_ipv4=payload['public_ipv4'], public_ipv4=payload['public_ipv4'],
ssh_authorized_keys=list(map(lambda x: x["name"], payload['ssh_authorized_keys'])), ssh_authorized_keys=list(map(lambda x: x["name"], payload['ssh_authorized_keys'])),
) )