From 0bff18a92bcebdc43d69cc388ce567a232931b63 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 06:33:29 +0000 Subject: [PATCH 1/4] feat(Dependencies): Update ansible-community/ansible-lint-action action to v6.17.0 | datasource | package | from | to | | ----------- | ------------------------------------- | ------- | ------- | | github-tags | ansible-community/ansible-lint-action | v6.16.0 | v6.17.0 | --- .github/workflows/ansible-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml index 7c63c1f3..cff572fe 100644 --- a/.github/workflows/ansible-lint.yml +++ b/.github/workflows/ansible-lint.yml @@ -9,4 +9,4 @@ jobs: - uses: actions/checkout@v4 - name: Run ansible-lint - uses: ansible-community/ansible-lint-action@v6.16.0 + uses: ansible-community/ansible-lint-action@v6.17.0 From 5ca492236ce25bc9df638ca94d2a0b18d80f4629 Mon Sep 17 00:00:00 2001 From: dweinholz Date: Fri, 6 Oct 2023 09:13:34 +0200 Subject: [PATCH 2/4] linting fixes --- conda/conda.yml | 10 +++++----- emgb/docker-compose.override.yml | 2 +- emgb/emgb.yml | 12 +++++------- emgb/emgb_metadata.yml | 1 - guacamole/roles/guacamole/tests/test.yml | 1 + jupyterlab/jupyterlab.yml | 12 ++++++------ packer/cleanup_base_cluster_images.yml | 16 +++++++-------- packer/cleanup_base_images.yml | 4 ++-- packer/cleanup_resenvs_images.yml | 25 +++++++++++++----------- packer/update_base_images.yml | 2 +- theiaide/theiaide.yml | 6 +++--- 11 files changed, 45 insertions(+), 46 deletions(-) diff --git a/conda/conda.yml b/conda/conda.yml index 16742d21..e986547d 100644 --- a/conda/conda.yml +++ b/conda/conda.yml @@ -27,19 +27,19 @@ - name: Add conda-forge channel become_user: "{{ conda_vars.default_user }}" - shell: timeout 1m bash -c 'source {{conda_vars.CONDA_DIR}}/bin/activate && conda config --add channels conda-forge' + ansible.builtin.shell: timeout 1m bash -c 'source {{conda_vars.CONDA_DIR}}/bin/activate && conda config --add channels conda-forge' args: executable: /bin/bash - name: Add anaconda channel become_user: "{{ conda_vars.default_user }}" - shell: timeout 1m bash -c 'source {{conda_vars.CONDA_DIR}}/bin/activate && conda config --add channels anaconda' + ansible.builtin.shell: timeout 1m bash -c 'source {{conda_vars.CONDA_DIR}}/bin/activate && conda config --add channels anaconda' args: executable: /bin/bash - name: Init .bashrc for conda become_user: "{{ conda_vars.default_user }}" - shell: timeout 1m bash -c 'source {{ conda_vars.CONDA_DIR}}/bin/activate && conda init' + ansible.builtin.shell: timeout 1m bash -c 'source {{ conda_vars.CONDA_DIR}}/bin/activate && conda init' args: executable: /bin/bash @@ -52,7 +52,7 @@ - name: Check for installed packages become_user: "{{ conda_vars.default_user }}" - shell: 'source {{ conda_vars.CONDA_DIR }}/bin/activate && conda activate {{ conda_vars.ENV_NAME|quote }} && conda list' + ansible.builtin.shell: 'source {{ conda_vars.CONDA_DIR }}/bin/activate && conda activate {{ conda_vars.ENV_NAME|quote }} && conda list' register: added_packages args: executable: /bin/bash @@ -60,7 +60,7 @@ - name: Install chosen packages become_user: "{{ conda_vars.default_user }}" - shell: 'source {{ conda_vars.CONDA_DIR }}/bin/activate && conda activate {{ conda_vars.ENV_NAME|quote }} + ansible.builtin.shell: 'source {{ conda_vars.CONDA_DIR }}/bin/activate && conda activate {{ conda_vars.ENV_NAME|quote }} && conda install --yes {{ item.key }}={{ item.value.version }}' args: executable: /bin/bash diff --git a/emgb/docker-compose.override.yml b/emgb/docker-compose.override.yml index 05bffb59..f92ead50 100644 --- a/emgb/docker-compose.override.yml +++ b/emgb/docker-compose.override.yml @@ -15,4 +15,4 @@ services: restart: always targetdb: - restart: always \ No newline at end of file + restart: always diff --git a/emgb/emgb.yml b/emgb/emgb.yml index f96891fe..343a557d 100644 --- a/emgb/emgb.yml +++ b/emgb/emgb.yml @@ -1,7 +1,7 @@ --- - name: Ensure python-is-python3 is installed - become: yes + become: true package: name: python-is-python3 state: present @@ -19,7 +19,7 @@ BINARY="yq_linux_amd64" # Change this if you need a different binary wget "https://github.com/mikefarah/yq/releases/download/${VERSION}/${BINARY}.tar.gz" -O - |\ tar xz && mv "${BINARY}" /usr/bin/yq - become: yes + become: true - name: Clone EMGB Repo git: @@ -43,11 +43,11 @@ cmd: ./prepare-import.sh args: chdir: "{{ emgb_vars.repo_path }}" - + - name: Copy docker-compose.override ansible.builtin.copy: src: docker-compose.override.yml - dest: "{{emgb_vars.repo_path}}" + dest: "{{ emgb_vars.repo_path }}" - name: Run yq command to delete nginx ports ansible.builtin.command: @@ -59,6 +59,4 @@ ansible.builtin.command: cmd: docker-compose up -d args: - chdir: "{{emgb_vars.repo_path}}" - - + chdir: "{{ emgb_vars.repo_path }}" diff --git a/emgb/emgb_metadata.yml b/emgb/emgb_metadata.yml index fae996ae..d542dee6 100644 --- a/emgb/emgb_metadata.yml +++ b/emgb/emgb_metadata.yml @@ -20,4 +20,3 @@ community_driven: true wiki_link: "" information_for_display: version: 1.6.0 - diff --git a/guacamole/roles/guacamole/tests/test.yml b/guacamole/roles/guacamole/tests/test.yml index f08718ea..0ff6637b 100644 --- a/guacamole/roles/guacamole/tests/test.yml +++ b/guacamole/roles/guacamole/tests/test.yml @@ -1,5 +1,6 @@ --- - hosts: localhost + name: Test remote_user: root roles: - guacamolerdp-ansible diff --git a/jupyterlab/jupyterlab.yml b/jupyterlab/jupyterlab.yml index 23c58dad..7849b791 100644 --- a/jupyterlab/jupyterlab.yml +++ b/jupyterlab/jupyterlab.yml @@ -26,40 +26,40 @@ - name: Adjust miniconda folder rights become: true - shell: chown -R {{jupyterlab_vars.default_user}}:{{jupyterlab_vars.default_user}} {{jupyterlab_vars.CONDA_DIR}}/ + ansible.builtin.shell: chown -R {{jupyterlab_vars.default_user}}:{{jupyterlab_vars.default_user}} {{jupyterlab_vars.CONDA_DIR}}/ when: not jupyterlab_vars.create_only_backend - name: Add bioconda channel become_user: "{{ jupyterlab_vars.default_user }}" - shell: timeout 1m bash -c 'source {{jupyterlab_vars.CONDA_DIR}}/bin/activate && conda config --add channels bioconda' + ansible.builtin.shell: timeout 1m bash -c 'source {{jupyterlab_vars.CONDA_DIR}}/bin/activate && conda config --add channels bioconda' args: executable: /bin/bash when: not jupyterlab_vars.create_only_backend - name: Add conda-forge channel become_user: "{{ jupyterlab_vars.default_user }}" - shell: timeout 1m bash -c 'source {{jupyterlab_vars.CONDA_DIR}}/bin/activate && conda config --add channels conda-forge' + ansible.builtin.shell: timeout 1m bash -c 'source {{jupyterlab_vars.CONDA_DIR}}/bin/activate && conda config --add channels conda-forge' args: executable: /bin/bash when: not jupyterlab_vars.create_only_backend - name: Add anaconda channel become_user: "{{ jupyterlab_vars.default_user }}" - shell: timeout 1m bash -c 'source {{jupyterlab_vars.CONDA_DIR}}/bin/activate && conda config --add channels anaconda' + ansible.builtin.shell: timeout 1m bash -c 'source {{jupyterlab_vars.CONDA_DIR}}/bin/activate && conda config --add channels anaconda' args: executable: /bin/bash when: not jupyterlab_vars.create_only_backend - name: Init .bashrc for conda become_user: "{{ jupyterlab_vars.default_user }}" - shell: timeout 1m bash -c 'source {{ jupyterlab_vars.CONDA_DIR}}/bin/activate && conda init' + ansible.builtin.shell: timeout 1m bash -c 'source {{ jupyterlab_vars.CONDA_DIR}}/bin/activate && conda init' args: executable: /bin/bash when: not jupyterlab_vars.create_only_backend - name: Create alias for environment become_user: "{{ jupyterlab_vars.default_user }}" - shell: echo $ALIAS_VARIABLE > ~/.bash_aliases + ansible.builtin.shell: echo $ALIAS_VARIABLE > ~/.bash_aliases environment: ALIAS_VARIABLE: alias {{ jupyterlab_vars.ENV_NAME| quote }}="conda activate {{ jupyterlab_vars.ENV_NAME| quote }}" when: not jupyterlab_vars.create_only_backend diff --git a/packer/cleanup_base_cluster_images.yml b/packer/cleanup_base_cluster_images.yml index bb487d39..3c526f28 100644 --- a/packer/cleanup_base_cluster_images.yml +++ b/packer/cleanup_base_cluster_images.yml @@ -14,7 +14,7 @@ when: keep is defined and keep | int > 0 - name: Retrieve list of all master base image - shell: > + ansible.builtin.shell: > openstack image list --private --tag "base_cluster" @@ -26,13 +26,12 @@ --sort created_at:desc -f json register: ubuntu_master_images_command + changed_when: false - name: Set master image fact - set_fact: + ansible.builtin.set_fact: ubuntu_master_images: "{{ ubuntu_master_images_command.stdout }}" - - - name: Echo Ubuntu images length ansible.builtin.debug: var: ubuntu_master_images | length @@ -49,10 +48,10 @@ loop: "{{ ubuntu_master_images }}" loop_control: index_var: index - when: ubuntu_master_images | length > limit | int and index >= limit | int + when: ubuntu_master_images | length > limit | int and index >= limit | int - name: Retrieve list of all worker base image - shell: > + ansible.builtin.shell: > openstack image list --tag "base_cluster" --tag "cluster" @@ -63,13 +62,12 @@ --sort created_at:desc -f json register: ubuntu_worker_images_command + changed_when: false - name: Set worker image fact - set_fact: + ansible.builtin.set_fact: ubuntu_worker_images: "{{ ubuntu_worker_images_command.stdout }}" - - - name: Echo Ubuntu images length ansible.builtin.debug: var: ubuntu_worker_images | length diff --git a/packer/cleanup_base_images.yml b/packer/cleanup_base_images.yml index f6c8610f..21a117e1 100644 --- a/packer/cleanup_base_images.yml +++ b/packer/cleanup_base_images.yml @@ -14,7 +14,7 @@ when: keep is defined and keep | int > 0 - name: Retrieve list of all images - shell: > + ansible.builtin.shell: > openstack image list --private --tag "base_image" @@ -23,7 +23,7 @@ --sort created_at:desc -f json register: ubuntu_images_command - + changed_when: false - name: Set image fact ansible.builtin.set_fact: diff --git a/packer/cleanup_resenvs_images.yml b/packer/cleanup_resenvs_images.yml index 4d6b5bb8..b901bf44 100644 --- a/packer/cleanup_resenvs_images.yml +++ b/packer/cleanup_resenvs_images.yml @@ -14,11 +14,11 @@ limit: "{{ keep | int }}" when: keep is defined and keep | int > 0 - - name: Retrieve list of all {{resenv}} base image - shell: > + - name: Retrieve list of all {{ resenv }} base image + ansible.builtin.shell: > openstack image list --private - --tag {{vars[resenv + '_tag']}} + --tag {{ vars[resenv + '_tag'] }} --property image_type=image --property os_version={{ os_version }} --property os_distro={{ os_distro }} @@ -26,11 +26,12 @@ --long -f json register: resenv_images_command + changed_when: false - name: Filter images excluding "cluster" tag - set_fact: - resenv_images: "{{ resenv_images_command.stdout|from_json | rejectattr('Tags', 'search', 'cluster')}}" + ansible.builtin.set_fact: + resenv_images: "{{ resenv_images_command.stdout | from_json | rejectattr('Tags', 'search', 'cluster') }}" - name: Echo Ubuntu images length ansible.builtin.debug: @@ -49,11 +50,11 @@ index_var: index when: resenv_images | length > limit | int and index >= limit | int - - name: Retrieve list of all {{resenv}} base image - shell: > + - name: Retrieve list of all {{ resenv }} base image + ansible.builtin.shell: > openstack image list --private - --tag {{vars[resenv + '_tag']}} + --tag {{ vars[resenv + '_tag'] }} --tag cluster --tag master --property image_type=image @@ -63,6 +64,7 @@ --long -f json register: resenv_master_images_command + changed_when: false - name: Set image fact ansible.builtin.set_fact: @@ -87,11 +89,11 @@ when: resenv_master_images | length > limit | int and index >= limit | int - - name: Retrieve list of all {{resenv}} base image - shell: > + - name: Retrieve list of all {{ resenv }} base image + ansible.builtin.shell: > openstack image list --private - --tag {{vars[resenv + '_tag']}} + --tag {{ vars[resenv + '_tag'] }} --tag cluster --tag worker --property image_type=image @@ -101,6 +103,7 @@ --long -f json register: resenv_worker_images_command + changed_when: false - name: Set image fact ansible.builtin.set_fact: diff --git a/packer/update_base_images.yml b/packer/update_base_images.yml index c36dd2db..61ad2008 100644 --- a/packer/update_base_images.yml +++ b/packer/update_base_images.yml @@ -69,7 +69,7 @@ - name: Delete local uploaded file - file: + ansible.builtin.file: path: "{{ name }}" state: absent when: update diff --git a/theiaide/theiaide.yml b/theiaide/theiaide.yml index 800da769..21df7083 100644 --- a/theiaide/theiaide.yml +++ b/theiaide/theiaide.yml @@ -27,13 +27,13 @@ theia_ide_workspace: ${HOME} - name: Install nvm - shell: | + ansible.builtin.shell: | curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.39.1/install.sh | NVM_DIR={{ theiaide_vars.NVM_INSTALL_DIR }} /bin/bash args: creates: "{{ theiaide_vars.NVM_INSTALL_DIR }}/nvm.sh" - name: Install node 12 and yarn - shell: | + ansible.builtin.shell: | source {{ theiaide_vars.NVM_INSTALL_DIR }}/nvm.sh nvm install 12 npm install -g yarn @@ -41,7 +41,7 @@ executable: bash - name: Install prebuild theia - shell: | + ansible.builtin.shell: | curl -o- https://bibiserv.cebitec.uni-bielefeld.de/resources/bibigrid/plugins/theia-ide_node12.tar.gz | tar -xzf - args: chdir: /opt From c627442826117547b25a79f6af2b57ca0d07afcc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 07:14:49 +0000 Subject: [PATCH 3/4] feat(Dependencies): Update dependency python-openstackclient to v6.3.0 | datasource | package | from | to | | ---------- | ---------------------- | ----- | ----- | | pypi | python-openstackclient | 6.2.0 | 6.3.0 | --- packer/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/requirements.txt b/packer/requirements.txt index 7972cb5f..b47fd7bf 100644 --- a/packer/requirements.txt +++ b/packer/requirements.txt @@ -1,5 +1,5 @@ openstacksdk==1.5.0 ansible==6.7.0 -python-openstackclient==6.2.0 +python-openstackclient==6.3.0 paramiko From fb34660a4041488bcca190ddc39c86093b16a43c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 07:15:54 +0000 Subject: [PATCH 4/4] feat(Dependencies): Update dependency autoscaling to v1.1.8 | datasource | package | from | to | | ---------- | -------------------------------------------- | ----- | ----- | | git-tags | https://github.com/deNBI/autoscaling-ansible | 1.1.7 | 1.1.8 | --- packer/requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/requirements.yml b/packer/requirements.yml index 4228d168..0397fb0d 100644 --- a/packer/requirements.yml +++ b/packer/requirements.yml @@ -16,7 +16,7 @@ roles: - name: autoscaling src: https://github.com/deNBI/autoscaling-ansible - version: 1.1.7 + version: 1.1.8 - name: geerlingguy.swap