From f8713542d74fbae57a96db917deef81c80d13e16 Mon Sep 17 00:00:00 2001 From: lumarel Date: Sat, 13 Jan 2024 07:49:46 +0100 Subject: [PATCH 1/3] Cleanup pyOpenSSL requirement --- build/requirements-infra.txt | 2 +- build/requirements-lint.txt | 2 +- build/requirements-storage.txt | 2 +- build/requirements-sync.txt | 2 +- build/requirements.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/requirements-infra.txt b/build/requirements-infra.txt index d9e4210..b3f389c 100644 --- a/build/requirements-infra.txt +++ b/build/requirements-infra.txt @@ -3,7 +3,7 @@ git+https://github.com/ansible/ansible-sign ncclient paramiko pykerberos -pyOpenSSL>22.1.0 +pyOpenSSL pypsrp[kerberos,credssp] pywinrm[kerberos,credssp] toml diff --git a/build/requirements-lint.txt b/build/requirements-lint.txt index fef8eeb..e018c33 100644 --- a/build/requirements-lint.txt +++ b/build/requirements-lint.txt @@ -3,7 +3,7 @@ git+https://github.com/ansible/ansible-sign ncclient paramiko pykerberos -pyOpenSSL>22.1.0 +pyOpenSSL pypsrp[kerberos,credssp] pywinrm[kerberos,credssp] toml diff --git a/build/requirements-storage.txt b/build/requirements-storage.txt index d9e4210..b3f389c 100644 --- a/build/requirements-storage.txt +++ b/build/requirements-storage.txt @@ -3,7 +3,7 @@ git+https://github.com/ansible/ansible-sign ncclient paramiko pykerberos -pyOpenSSL>22.1.0 +pyOpenSSL pypsrp[kerberos,credssp] pywinrm[kerberos,credssp] toml diff --git a/build/requirements-sync.txt b/build/requirements-sync.txt index 081f3a6..354a62e 100644 --- a/build/requirements-sync.txt +++ b/build/requirements-sync.txt @@ -2,7 +2,7 @@ git+https://github.com/ansible/ansible-sign ncclient paramiko -pyOpenSSL>22.1.0 +pyOpenSSL toml pexpect>=4.5 python-daemon diff --git a/build/requirements.txt b/build/requirements.txt index 0f802d1..f55993d 100644 --- a/build/requirements.txt +++ b/build/requirements.txt @@ -3,7 +3,7 @@ git+https://github.com/ansible/ansible-sign ncclient paramiko pykerberos -pyOpenSSL>22.1.0 +pyOpenSSL pypsrp[kerberos,credssp] pywinrm[kerberos,credssp] toml From d7b25856cf1625ee01311ea5cdb41d16cb58a1b4 Mon Sep 17 00:00:00 2001 From: lumarel Date: Sat, 13 Jan 2024 07:50:13 +0100 Subject: [PATCH 2/3] Fix got applied to community.vmware --- build/requirements-infra.yml | 1 - build/requirements-lint.yml | 1 - build/requirements.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/build/requirements-infra.yml b/build/requirements-infra.yml index 8c9dca7..33e6eb3 100644 --- a/build/requirements-infra.yml +++ b/build/requirements-infra.yml @@ -7,6 +7,5 @@ collections: - name: community.crypto - name: community.general - name: community.vmware - version: <4.0.0 - name: netapp.ontap - name: vmware.vmware_rest diff --git a/build/requirements-lint.yml b/build/requirements-lint.yml index 4055975..50d9e8a 100644 --- a/build/requirements-lint.yml +++ b/build/requirements-lint.yml @@ -16,7 +16,6 @@ collections: - name: community.general - name: community.kubernetes - name: community.vmware - version: <4.0.0 - name: community.zabbix version: <2.0.0 - name: kubernetes.core diff --git a/build/requirements.yml b/build/requirements.yml index fc359e5..c0f52bf 100644 --- a/build/requirements.yml +++ b/build/requirements.yml @@ -8,7 +8,6 @@ collections: - name: community.crypto - name: community.general - name: community.vmware - version: <4.0.0 - name: community.zabbix version: <2.0.0 - name: vmware.vmware_rest From c725d40f1f16d666789c8a8958471f18cf8b2571 Mon Sep 17 00:00:00 2001 From: lumarel Date: Sat, 13 Jan 2024 07:50:25 +0100 Subject: [PATCH 3/3] Update Readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f6a8777..b6f7ce5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# AWX custom Execution Environment - default +# AWX custom Execution Environment -An Ansible execution environment for a private AWX - default set. +This repo builds several costumized Ansible execution environments tailored for special needs. This repo got forked from the ansible/awx-ee repo. ## Build the image locally