From b5b7c3a2908f49ee3e4710e4158bc66ab81c1b54 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Thu, 2 May 2024 10:00:01 +0200 Subject: [PATCH 1/3] Upgrade default ansible version --- contextualization/conf-ansible.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contextualization/conf-ansible.yml b/contextualization/conf-ansible.yml index f148c7fb..f1dc5a82 100644 --- a/contextualization/conf-ansible.yml +++ b/contextualization/conf-ansible.yml @@ -5,7 +5,7 @@ gather_facts: false vars: # Ansible specific Version or "latest" - ANSIBLE_VERSION: 2.9.26 + ANSIBLE_VERSION: 4.10.0 tasks: - name: Set Ansible version from env if defined set_fact: ANSIBLE_VERSION={{ lookup('env','ANSIBLE_VERSION') }} From 56ec609d4de9be4ad213472611afeee67d32d110 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Thu, 2 May 2024 10:57:50 +0200 Subject: [PATCH 2/3] Upgrade default ansible version --- contextualization/conf-ansible.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/contextualization/conf-ansible.yml b/contextualization/conf-ansible.yml index f1dc5a82..49381539 100644 --- a/contextualization/conf-ansible.yml +++ b/contextualization/conf-ansible.yml @@ -167,6 +167,13 @@ executable: pip3 extra_args: "{{ extra_args }}" + - name: Set Ansible newer version for python 3.12 + set_fact: + ANSIBLE_VERSION: 6.7.0 + when: + - ansible_python_version is version('3.12', '>=') + - ANSIBLE_VERSION is version('6.7.0', '<') + - name: Install ansible {{ ANSIBLE_VERSION }} with Pip pip: name: ansible From 5d4e3a1225f695cbe73da5570423d922289efdd2 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Thu, 2 May 2024 10:58:07 +0200 Subject: [PATCH 3/3] Upgrade default ansible version --- docker-devel/Dockerfile | 2 +- docker-py3/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-devel/Dockerfile b/docker-devel/Dockerfile index e4dbc772..3c0a7dea 100644 --- a/docker-devel/Dockerfile +++ b/docker-devel/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y python3 python3 # Install IM RUN apt-get update && apt-get install --no-install-recommends -y python3-setuptools python3-pip git && \ pip3 install msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns azure-identity==1.8.0 && \ - pip3 install pyOpenSSL cheroot xmltodict pymongo ansible==6.4.0&& \ + pip3 install pyOpenSSL cheroot xmltodict pymongo ansible==6.7.0&& \ pip3 install urllib3==1.26.18 git+https://github.com/grycap/im@$BRANCH && \ apt-get purge -y python3-pip git && \ apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/ diff --git a/docker-py3/Dockerfile b/docker-py3/Dockerfile index b68a7479..37eba3f2 100644 --- a/docker-py3/Dockerfile +++ b/docker-py3/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y python3 python3 # Install IM RUN apt-get update && apt-get install --no-install-recommends -y python3-setuptools python3-pip git && \ pip3 install msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns azure-identity==1.8.0 && \ - pip3 install pyOpenSSL cheroot xmltodict pymongo ansible==6.4.0&& \ + pip3 install pyOpenSSL cheroot xmltodict pymongo ansible==6.7.0&& \ pip3 install urllib3==1.26.18 IM==1.16.0 && \ apt-get purge -y python3-pip git && \ apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/