Merge pull request #905 from deNBI/staging

Staging

.env.in

@@ -3,6 +3,7 @@ CLOUD_PORTAL_CLIENT_TAG=0.1.0-beta.0.15.1
 BIBIGRID_TAG=bibigrid-rest-2.3
 FORC_API_KEY=
 
+
 CLIENT_PORT=
 OS_AUTH_URL=
 OS_PROJECT_ID=
@@ -13,7 +14,7 @@ OS_PROJECT_DOMAIN_ID=
 OS_PASSWORD=
 
 # Filebeat
-FILEBEAT_TAG=7.15.1
+FILEBEAT_TAG=7.15.2
 ELASTIC_USER=
 ELASTIC_PASSWORD=
 HOST=portal-dev.denbi.de

Dockerfile.update

@@ -1,3 +1,3 @@
 FROM denbicloud/cloud-portal-client:0.1.0-beta.0.15.1
 FROM bibiserv/bibigrid:bibigrid-rest-2.3
-FROM docker.elastic.co/beats/filebeat:7.15.1
+FROM docker.elastic.co/beats/filebeat:7.15.2

VirtualMachineService/VirtualMachineHandler.py

@@ -2204,7 +2204,6 @@ def create_snapshot(self, openstack_id, name, elixir_id, base_tags, description)
             LOG.exception("Create snapshot {0} error: {1}".format(openstack_id, e))
 
             raise conflictException(Reason="409")
-            return None
         except Exception:
             LOG.exception("Instance {0} not found".format(openstack_id))
             return None

requirements.txt

@@ -1,4 +1,4 @@
-setuptools==58.5.3
+setuptools==59.1.0
 thrift==0.15.0
 python-keystoneclient
 openstacksdk ==0.59.0
@@ -9,6 +9,6 @@ flake8==4.0.1
 ruamel.yaml<0.18.0
 paramiko==2.8.0
 pyvim==3.0.2
-redis==3.5.3
+redis==4.0.0
 requests==2.26.0
 pyyaml==6.0