Skip to content
This repository has been archived by the owner on May 27, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
dweinholz committed Jul 22, 2022
2 parents 2e64291 + 65ef7ea commit 38ac380
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
7 changes: 6 additions & 1 deletion VirtualMachineService/VirtualMachineHandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ def __init__(self, config):
self.BIBIGRID_ANSIBLE_ROLES = cfg["bibigrid"].get(
"ansibleGalaxyRoles", []
)
LOG.info(f"Loaded Ansible Galaxy Roles for Bibigrid:\n {self.BIBIGRID_ANSIBLE_ROLES}")

LOG.info(msg=f"Bibigrd url loaded: {self.BIBIGRID_URL}")
except Exception as e:
Expand Down Expand Up @@ -1972,6 +1973,9 @@ def get_cluster_status(self, cluster_id):
json_resp = response.json(strict=False)
json_resp["log"] = str(json_resp.get("log", ""))
json_resp["msg"] = str(json_resp.get("msg", ""))
msg=json_resp["msg"]
info=json_resp.get("info","")
LOG.info(f"Cluster {cluster_id} status: - {msg} | {info}")
return json_resp

def bibigrid_available(self):
Expand Down Expand Up @@ -2048,6 +2052,7 @@ def add_cluster_machine(
pub_key,
project_name,
project_id,

):
LOG.info(f"Add machine to [{name}] {cluster_id} - {key_name}")
image = self.get_image(image=image)
Expand Down Expand Up @@ -2612,7 +2617,7 @@ def create_security_group(
direction=resenv_metadata.direction,
protocol=resenv_metadata.protocol,
port_range_max=resenv_metadata.port,
port_range_min=resenv_metadata.port,
port_range_miflavorn=resenv_metadata.port,
security_group_id=new_security_group["id"],
remote_group_id=self.FORC_REMOTE_ID,
)
Expand Down
4 changes: 2 additions & 2 deletions VirtualMachineService/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ bibigrid:
bibigrid_modes:
- slurm
ansibleGalaxyRoles:
- name: autoscaling,
hosts: master,
- name: autoscaling
hosts: master
git: https://github.com/patricS4/autoscaling-config-ansible


Expand Down

0 comments on commit 38ac380

Please sign in to comment.