Merge pull request #1131 from deNBI/dev

Dev

VirtualMachineService/VirtualMachineHandler.py

@@ -1460,11 +1460,10 @@ def delete_backend(self, id):
             LOG.exception(e)
             return str(-1)
 
-    def add_user_to_backend(self, backend_id, owner_id, user_id):
+    def add_user_to_backend(self, backend_id, user_id):
         try:
             post_url = f"{self.RE_BACKEND_URL}{self.USERS_URL}/{backend_id}"
             user_info = {
-                "owner": owner_id,
                 "user": user_id,
             }
         except Exception as e:
@@ -1513,10 +1512,9 @@ def get_users_from_backend(self, backend_id):
             LOG.info(msg=f"Get users for backend timed out. {e}")
             return []
 
-    def delete_user_from_backend(self, backend_id, owner_id, user_id):
+    def delete_user_from_backend(self, backend_id, user_id):
         delete_url = f"{self.RE_BACKEND_URL}{self.USERS_URL}/{backend_id}"
         user_info = {
-            "owner": owner_id,
             "user": user_id,
         }
         try:
@@ -2185,6 +2183,13 @@ def start_cluster(self, public_key, master_instance, worker_instances, user):
             "masterInstance": master_instance,
             "workerInstances": wI,
             "useMasterWithPublicIp": False,
+            "ansibleGalaxyRoles": [
+                {
+                    "name": "autoscaling",
+                    "hosts": "master",
+                    "git": "https://github.com/patricS4/autoscaling-config-ansible",
+                }
+            ],
         }
         for mode in self.BIBIGRID_MODES:
             body.update({mode: True})

VirtualMachineService/VirtualMachineService-remote

@@ -80,11 +80,9 @@ if len(sys.argv) <= 1 or sys.argv[1] == "--help":
     print("   get_backends_by_template(string template)")
     print("  Backend get_backend_by_id(i64 id)")
     print("  string delete_backend(i64 id)")
-    print("   add_user_to_backend(i64 backend_id, string owner_id, string user_id)")
+    print("   add_user_to_backend(i64 backend_id, string user_id)")
     print("   get_users_from_backend(i64 backend_id)")
-    print(
-        "   delete_user_from_backend(i64 backend_id, string owner_id, string user_id)"
-    )
+    print("   delete_user_from_backend(i64 backend_id, string user_id)")
     print("   get_templates()")
     print("   get_allowed_templates()")
     print("   get_templates_by_template(string template_name)")
@@ -585,14 +583,13 @@ elif cmd == "delete_backend":
     )
 
 elif cmd == "add_user_to_backend":
-    if len(args) != 3:
-        print("add_user_to_backend requires 3 args")
+    if len(args) != 2:
+        print("add_user_to_backend requires 2 args")
         sys.exit(1)
     pp.pprint(
         client.add_user_to_backend(
             eval(args[0]),
             args[1],
-            args[2],
         )
     )
 
@@ -607,14 +604,13 @@ elif cmd == "get_users_from_backend":
     )
 
 elif cmd == "delete_user_from_backend":
-    if len(args) != 3:
-        print("delete_user_from_backend requires 3 args")
+    if len(args) != 2:
+        print("delete_user_from_backend requires 2 args")
         sys.exit(1)
     pp.pprint(
         client.delete_user_from_backend(
             eval(args[0]),
             args[1],
-            args[2],
         )
     )
 

docker-compose.bibigrid.yml

@@ -17,7 +17,7 @@ services:
 
   client_redis:
     container_name: client_redis
-    image: redis:7.0.1
+    image: redis:7.0.2
     expose:
       - "6379"
     networks:
@@ -40,7 +40,7 @@ services:
 
   # filebeat
   filebeat:
-    image: docker.elastic.co/beats/filebeat:8.2.2
+    image: docker.elastic.co/beats/filebeat:8.2.3
     env_file:
       - .env
     volumes:

docker-compose.dev.bibigrid.yml

@@ -18,7 +18,7 @@ services:
 
   client_redis:
     container_name: client_redis
-    image: redis:7.0.1
+    image: redis:7.0.2
     expose:
       - "6379"
     networks:

docker-compose.dev.yml

@@ -18,7 +18,7 @@ services:
 
   client_redis:
     container_name: client_redis
-    image: redis:7.0.1
+    image: redis:7.0.2
     expose:
       - "6379"
     networks:

docker-compose.yml

@@ -17,7 +17,7 @@ services:
 
   client_redis:
     container_name: client_redis
-    image: redis:7.0.1
+    image: redis:7.0.2
     expose:
       - "6379"
     networks:
@@ -26,7 +26,7 @@ services:
   # filebeat
   filebeat:
     container_name: client_filebeat
-    image: docker.elastic.co/beats/filebeat:8.2.2
+    image: docker.elastic.co/beats/filebeat:8.2.3
     env_file:
       - .env
     volumes: