Merge pull request #364 from deNBI/dev

.env.in

@@ -1,5 +1,6 @@
 CLOUD_CLIENT_TAG=
+CLIENT_PORT=
 FORC_API_KEY=
 ELASTIC_USER=
 ELASTIC_PASSWORD=
-FILEBEAT_TAG=7.1.0
+FILEBEAT_TAG=7.1.0

README.md

@@ -233,7 +233,7 @@ where
 
   * inventory_openstack is your inventory file which you created in the first step.
 
-  * You can start only the client or with bibigrid with tags "bibigrid" or "client_only"
+  * If you also want to start bibigrid use the tag "bibigrid"
 **Choose  different files**
 
 You can also specify different .env , .secrets and server.pem files.

VirtualMachineService/ancon/playbooks/rstudio.yml

@@ -11,6 +11,11 @@
     name: "{{ rstudio_vars.DEFAULT_USER }}"
     password: "{{ rstudio_vars.DEFAULT_PASSWORD_HASHED }}"
 
+- name: Check if profiles file already exists
+  stat:
+    path: "{{ rstudio_vars.PROFILES_FILE_PATH }}"
+  register: stat_profiles_file
+
 - name: Install R role
   include_role:
     name: oefenweb.r
@@ -23,6 +28,15 @@
     rstudio_install: [r-base]
   when: rstudio_vars.create_only_backend == "false"
 
+- name: Copy profiles file if not existing
+  copy:
+    content: "[*]\nsession-timeout-minutes=180"
+    dest: "{{ rstudio_vars.PROFILES_FILE_PATH }}"
+    mode: "0644"
+    owner: "root"
+    group: "root"
+  when: stat_profiles_file.stat.exists == False
+
 - name: Flush rstudio handlers
   meta: flush_handlers
   when: rstudio_vars.create_only_backend == "false"

VirtualMachineService/ancon/playbooks/rstudio_vars_file.yml

@@ -3,3 +3,4 @@ rstudio_vars:
   create_only_backend:
   DEFAULT_USER: ubuntu
   DEFAULT_PASSWORD_HASHED: $6$rounds=656000$kDXfaoylNAAH4hiN$Se1C7um7OW7ETs.L19uy1xn9SJjtjHylbF.Xv/YhRWilSyzDcX7nSajMth8LgZNiRJmO3.wBxcYeJnsgW4CLL1
+  PROFILES_FILE_PATH: /etc/rstudio/profiles

docker-compose.bibigrid.yml

@@ -3,7 +3,7 @@ services:
   portal-client:
     image: denbicloud/cloud-portal-client:${CLOUD_CLIENT_TAG}
     ports:
-     - "9090:9090"
+     - ${CLIENT_PORT}:9090
 
     env_file:
         - .env

docker-compose.dev.bibigrid.yml

@@ -5,7 +5,7 @@ services:
        context: .
        dockerfile: Dockerfile
     ports:
-     - "9090:9090"
+     - ${CLIENT_PORT}:9090
 
     env_file:
         - .env

docker-compose.dev.yml

@@ -5,7 +5,7 @@ services:
        context: .
        dockerfile: Dockerfile
     ports:
-     - "9090:9090"
+     - ${CLIENT_PORT}:9090
 
     env_file:
         - .env

docker-compose.yml

@@ -3,7 +3,7 @@ services:
   portal-client:
     image: denbicloud/cloud-portal-client:${CLOUD_CLIENT_TAG}
     ports:
-     - "9090:9090"
+     - ${CLIENT_PORT}:9090
 
     env_file:
         - .env

plays/setup_client.yml

@@ -132,7 +132,8 @@
         files:
           - docker-compose.yml
       become: yes
-      tags: client_only
+      when: 'bibigrid' not in ansible_run_tags
+      tags: always
 
     - name: Start  docker container with bibigrid
       docker_compose:

requirements.txt

@@ -1,4 +1,4 @@
-setuptools==47.1.1
+setuptools==47.3.0
 thrift >= 0.11.0,<0.20.0
 python-keystoneclient
 openstacksdk ==0.46.0