Merge branch 'dev' into staging

deNBI · Apr 22, 2021 · 9208431 · 9208431
2 parents 149e8b2 + cd7fee1
commit 9208431
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/docker-compose.bibigrid.yml b/docker-compose.bibigrid.yml
@@ -7,7 +7,7 @@ services:
     env_file:
       - .env
     volumes:
-      -  ${client_PERSISTENT_PATH}/config.yml:/code/VirtualMachineService/local_config.yml
+      -  ${client_PERSISTENT_PATH}/config.yml:/code/VirtualMachineService/config.yml
       -  ${client_PERSISTENT_PATH}/server.pem:/code/VirtualMachineService/keys/server.pem
       - ./logs/client:/code/VirtualMachineService/log:rw
     command: python3 VirtualMachineServer.py /code/VirtualMachineService/config.yml

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     env_file:
       - .env
     volumes:
-      -  ${client_PERSISTENT_PATH}/config.yml:/code/VirtualMachineService/local_config.yml
+      -  ${client_PERSISTENT_PATH}/config.yml:/code/VirtualMachineService/config.yml
       -  ${client_PERSISTENT_PATH}/server.pem:/code/VirtualMachineService/keys/server.pem
       - ./logs/client:/code/VirtualMachineService/log:rw
     command: python3 VirtualMachineServer.py /code/VirtualMachineService/config.yml

diff --git a/plays/setup_client.yml b/plays/setup_client.yml
@@ -58,7 +58,7 @@
       copy: src={{ item.src }} dest={{ item.dest }}
       with_items:
         - { src:  "{{client.CERT_FILE_PATH}}", dest: "{{ client.PERSISTENT_PATH }}/server.pem" }
-      when: client_server_pem is not defined and stat_client_pem.exists == False
+      when: client_server_pem is not defined and stat_client_pem.stat.exists == False
       tags: always
 
     # Copy envs
@@ -93,6 +93,10 @@
       shell: rm -f "{{ client.REPO_PATH }}"/.ansible_environment && jq -r '.[]|"\(.key)=\(.value)"' "{{ client.REPO_PATH }}"/.ansible_environment_*.json >> "{{ client.REPO_PATH }}"/.ansible_environment
       tags: always
 
+    - name: Append variables to env file
+      shell: cat "{{ client.REPO_PATH }}"/.ansible_environment >> "{{ client.REPO_PATH }}"/.env
+      tags: always
+
     # Start
     - name: Start client docker container without bibigrid
       docker_compose:

diff --git a/requirements.txt b/requirements.txt
@@ -5,7 +5,7 @@ openstacksdk ==0.55.0
 deprecated == 1.2.12
 Click==7.1.2
 ansible==3.2.0
-flake8==3.9.0
+flake8==3.9.1
 ruamel.yaml<0.18.0
 paramiko==2.7.2
 pyvim==3.0.2