diff --git a/.env.in b/.env.in index 781b0e98..0fc658c5 100644 --- a/.env.in +++ b/.env.in @@ -10,6 +10,7 @@ OS_USERNAME= OS_USER_DOMAIN_NAME= OS_PROJECT_DOMAIN_ID= OS_PASSWORD= +OS_REGION_NAME= # Filebeat ELASTIC_USER= diff --git a/VirtualMachineService/ancon/Playbook.py b/VirtualMachineService/ancon/Playbook.py index 8cbbee33..c1e82c9f 100644 --- a/VirtualMachineService/ancon/Playbook.py +++ b/VirtualMachineService/ancon/Playbook.py @@ -141,7 +141,7 @@ def load_vars(): for p in (v.strip('"')).split(): p_array.append(p.split("=")) for p in p_array: - p_dict.update({p[0]: {"version": p[1], "build": p[2]}}) + p_dict.update({p[0]: {"version": p[1]}}) data[playbook_name + "_tools"][k] = p_dict if playbook_name in self.loaded_metadata_keys: for k, v in playbook_vars.items(): diff --git a/VirtualMachineService/ancon/playbooks/bioconda.yml b/VirtualMachineService/ancon/playbooks/bioconda.yml index e9523550..dee7ae1d 100644 --- a/VirtualMachineService/ancon/playbooks/bioconda.yml +++ b/VirtualMachineService/ancon/playbooks/bioconda.yml @@ -73,7 +73,7 @@ - name: Install chosen packages become_user: "{{ bioconda_user.name }}" - shell: "timeout {{ bioconda_tools.timeout_length }} bash -c 'source {{ bioconda_folders.conda_dir }}/bin/activate && conda activate {{ bioconda_tools.env | quote}} && conda install --yes {{ item.key }}={{ item.value.version }}={{ item.value.build }}'" + shell: "timeout {{ bioconda_tools.timeout_length }} bash -c 'source {{ bioconda_folders.conda_dir }}/bin/activate && conda activate {{ bioconda_tools.env | quote}} && conda install --yes {{ item.key }}={{ item.value.version }}'" args: executable: /bin/bash loop: "{{ q('dict', bioconda_tools.packages) }}" diff --git a/VirtualMachineService/ancon/playbooks/bioconda_vars_file.yml b/VirtualMachineService/ancon/playbooks/bioconda_vars_file.yml index d759e859..3439a158 100644 --- a/VirtualMachineService/ancon/playbooks/bioconda_vars_file.yml +++ b/VirtualMachineService/ancon/playbooks/bioconda_vars_file.yml @@ -6,7 +6,7 @@ bioconda_tools: bioconda_folders: install_script: "/home/{{ bioconda_user.name }}/install_miniconda3.sh" conda_dir: "/home/{{ bioconda_user.name }}/miniconda3" - conda_installer_url: "https://repo.anaconda.com/miniconda/Miniconda3-4.6.14-Linux-x86_64.sh" + conda_installer_url: "https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh" bioconda_user: name: "ubuntu" diff --git a/ansible.cfg b/ansible.cfg index 4c66924d..911e2da9 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,7 +1,13 @@ [defaults] host_key_checking = False +callbacks_enabled = ansible.posix.profile_tasks roles_path = ~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles:/code/VirtualMachineService/ancon/playbooks/roles + +[callback_profile_tasks] +task_output_limit = 30 + + [paramiko_connection] host_key_checking = False env:ANSIBLE_PARAMIKO_HOST_KEY_CHECKING diff --git a/ansible_requirements.yml b/ansible_requirements.yml index d812e258..1e1709e0 100644 --- a/ansible_requirements.yml +++ b/ansible_requirements.yml @@ -8,3 +8,5 @@ roles: collections: - name: community.docker version: 1.8.0 + - name: ansible.posix + version: 1.3.0 diff --git a/docker-compose.bibigrid.yml b/docker-compose.bibigrid.yml index 9237589a..87ef144c 100644 --- a/docker-compose.bibigrid.yml +++ b/docker-compose.bibigrid.yml @@ -40,7 +40,7 @@ services: # filebeat filebeat: - image: docker.elastic.co/beats/filebeat:8.1.3 + image: docker.elastic.co/beats/filebeat:8.2.0 env_file: - .env volumes: diff --git a/docker-compose.yml b/docker-compose.yml index 2182f836..4d15c87c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ services: # filebeat filebeat: container_name: client_filebeat - image: docker.elastic.co/beats/filebeat:8.1.3 + image: docker.elastic.co/beats/filebeat:8.2.0 env_file: - .env volumes: diff --git a/requirements.txt b/requirements.txt index db82dfb3..a274d2d6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,8 +3,8 @@ thrift==0.16.0 python-keystoneclient openstacksdk ==0.61.0 deprecated == 1.2.13 -ansible==5.7.0 -Click==8.1.2 +ansible==5.7.1 +Click==8.1.3 flake8==4.0.1 paramiko==2.10.4 ruamel.yaml==0.17.21