Merge branch 'staging'

Author: dweinholz

.gitignore

@@ -156,3 +156,4 @@ fabric.properties
 #*.sh
 .env_*
 VirtualMachineService/config/config_*
+clouds.yaml

docker-compose.bibigrid.host.yml

@@ -20,7 +20,7 @@ services:
   simplevm_client_redis:
     container_name: simplevm_client_redis
     network_mode: host  # Use the host network namespace
-    image: redis:7.4.3
+    image: redis:8.0.2
     expose:
       - "6379"
 
@@ -42,7 +42,7 @@ services:
 
   simplevm_client_filebeat:
     container_name: simplevm_client_filebeat
-    image: docker.elastic.co/beats/filebeat:9.0.1
+    image: docker.elastic.co/beats/filebeat:9.0.2
     network_mode: host  # Use the host network namespace
 
     env_file:

docker-compose.bibigrid.yml

@@ -20,7 +20,7 @@ services:
 
   simplevm_client_redis:
     container_name: simplevm_client_redis
-    image: redis:7.4.3
+    image: redis:8.0.2
     expose:
       - "6379"
     networks:
@@ -43,7 +43,7 @@ services:
 
   # filebeat
   simplevm_filebeat:
-    image: docker.elastic.co/beats/filebeat:9.0.1
+    image: docker.elastic.co/beats/filebeat:9.0.2
     env_file:
       - .env
     volumes:

docker-compose.dev.bibigrid.yml

@@ -20,7 +20,7 @@ services:
 
   client_redis:
     container_name: simplevm_client_redis
-    image: redis:7.4.3
+    image: redis:8.0.2
     expose:
       - "6379"
     networks:
@@ -29,15 +29,10 @@ services:
   simplevm_bibigrid:
     container_name: simplevm_bibigrid
     image: quay.io/denbicloud/bibigrid:${BIBIGRID_TAG}
-    env_file:
-      - .env
     volumes:
-      - ./scripts/bibigrid/clear_keys_cron:/etc/crontabs/root
-    environment:
-      - server.enableHttps=false
-      - server.enableHttp=true
+      - ./clouds.yaml:/root/.config/bibigrid/clouds.yaml
     expose:
-      - "8080"
+      - "9123"
     networks:
       - portal
 

docker-compose.dev.giessen.yml

@@ -20,7 +20,7 @@ services:
 
   simplevm_client_giessen_redis:
     container_name: simplevm_client_giessen_redis
-    image: redis:7.4.3
+    image: redis:8.0.2
     expose:
       - "6379"
     networks:

docker-compose.dev.yml

@@ -20,7 +20,7 @@ services:
 
   client_redis:
     container_name: simplevm_client_redis
-    image: redis:7.4.3
+    image: redis:8.0.2
     expose:
       - "6379"
     networks:

docker-compose.host.yml

@@ -21,15 +21,15 @@ services:
   simplevm_client_redis:
     container_name: simplevm_client_redis
     network_mode: host  # Use the host network namespace
-    image: redis:7.4.3
+    image: redis:8.0.2
     expose:
       - "6379"
     networks:
       - portal
 
   simplevm_client_filebeat:
     container_name: simplevm_client_filebeat
-    image: docker.elastic.co/beats/filebeat:9.0.1
+    image: docker.elastic.co/beats/filebeat:9.0.2
     env_file:
       - .env
     volumes:

docker-compose.yml

@@ -20,7 +20,7 @@ services:
 
   simplevm_client_redis:
     container_name: simplevm_client_redis
-    image: redis:7.4.3
+    image: redis:8.0.2
     expose:
       - "6379"
     networks:
@@ -29,7 +29,7 @@ services:
   # filebeat
   simplevm_client_filebeat:
     container_name: simplevm_client_filebeat
-    image: docker.elastic.co/beats/filebeat:9.0.1
+    image: docker.elastic.co/beats/filebeat:9.0.2
     env_file:
       - .env
     volumes:

portal_client.thrift

@@ -210,6 +210,14 @@ struct ClusterInstance{
     2: required string image
 }
 
+struct ClusterVolume{
+    1: required string openstack_id
+    2: required bool permanent
+    3: required bool exists
+    4: required int size
+    5: optional string type  = "ext4"
+}
+
 struct ClusterWorker{
 
     1: required string type
@@ -770,7 +778,7 @@ service VirtualMachineService {
      */
     map<string,string> get_limits()
 
-     ClusterMessage start_cluster(1:list<string> public_keys,2: ClusterInstance master_instance,3:list<ClusterWorker> worker_instances,4:ClusterInstanceMetadata metadata)
+     ClusterMessage start_cluster(1:list<string> public_keys,2: ClusterInstance master_instance,3:list<ClusterWorker> worker_instances,4:ClusterInstanceMetadata metadata,5:optional ClusterVolume shared_volume)
 
      void terminate_cluster(1:string cluster_id) throws(1:ClusterNotFoundException c) /*TODO throe error*/
 

requirements-test.txt

@@ -1,3 +1,3 @@
 pytest==8.3.5
 pytest-cov==6.1.1
-coverage==7.8.0
+coverage==7.8.2