Merge branch 'dev' into staging

deNBI · Jul 22, 2022 · 0483c49 · 0483c49
2 parents b3a72b6 + 38ac380
commit 0483c49
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/VirtualMachineService/VirtualMachineHandler.py b/VirtualMachineService/VirtualMachineHandler.py
@@ -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:
@@ -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):
@@ -2612,7 +2616,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,
                 )

diff --git a/VirtualMachineService/config/config.yml b/VirtualMachineService/config/config.yml
@@ -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
 
 

diff --git a/docker-compose.bibigrid.yml b/docker-compose.bibigrid.yml
@@ -17,7 +17,7 @@ services:
 
   client_redis:
     container_name: client_redis
-    image: redis:7.0.2
+    image: redis:7.0.3
     expose:
       - "6379"
     networks:

diff --git a/docker-compose.dev.bibigrid.yml b/docker-compose.dev.bibigrid.yml
@@ -18,7 +18,7 @@ services:
 
   client_redis:
     container_name: client_redis
-    image: redis:7.0.2
+    image: redis:7.0.3
     expose:
       - "6379"
     networks:

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -18,7 +18,7 @@ services:
 
   client_redis:
     container_name: client_redis
-    image: redis:7.0.2
+    image: redis:7.0.3
     expose:
       - "6379"
     networks:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
 
   client_redis:
     container_name: client_redis
-    image: redis:7.0.2
+    image: redis:7.0.3
     expose:
       - "6379"
     networks: