diff --git a/galaxy.yml b/galaxy.yml index 9cd71aa5b..c762ff27c 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -18,9 +18,10 @@ tags: - RHOSP - EDPM dependencies: - ansible.posix: '*' - community.general: '*' - containers.podman: '*' + ansible.posix: "==1.2.0" + community.general: "==4.0.0" + containers.podman: "==1.10.4" + fedora.linux_system_roles: "==1.23.0" repository: https://github.com/openstack-k8s-operators/edpm-ansible documentation: https://openstack-k8s-operators.github.io/edpm-ansible homepage: https://github.com/openstack-k8s-operators/edpm-ansible diff --git a/openstack_ansibleee/Containerfile b/openstack_ansibleee/Containerfile index d58e0f3e7..76a3f2e6d 100644 --- a/openstack_ansibleee/Containerfile +++ b/openstack_ansibleee/Containerfile @@ -8,7 +8,6 @@ COPY $REMOTE_SOURCE $REMOTE_SOURCE_DIR RUN $REMOTE_SOURCE_DIR/openstack_ansibleee/setup.sh RUN cd $REMOTE_SOURCE_DIR/openstack_ansibleee && \ - ansible-galaxy collection install -U --timeout 120 -r ansibleee-requirements.yaml --collections-path "/usr/share/ansible/collections" && \ ansible-galaxy collection install -U --timeout 120 -r requirements.yaml --collections-path "/usr/share/ansible/collections" && \ ansible-galaxy collection install -U $REMOTE_SOURCE_DIR --collections-path "/usr/share/ansible/collections" diff --git a/openstack_ansibleee/ansibleee-requirements.yaml b/openstack_ansibleee/ansibleee-requirements.yaml deleted file mode 100644 index a9c13c46c..000000000 --- a/openstack_ansibleee/ansibleee-requirements.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -collections: - - name: fedora.linux_system_roles diff --git a/openstack_ansibleee/requirements.txt b/openstack_ansibleee/requirements.txt index f1a262c7d..511c6474a 100644 --- a/openstack_ansibleee/requirements.txt +++ b/openstack_ansibleee/requirements.txt @@ -1,4 +1,4 @@ -ansible-core>=2.16.1 -ansible-runner>=2.4.0 -ansible-builder>=3.1.0 -dumb-init>=1.2.2 +ansible-core==2.16.11 +ansible-runner==2.4.0 +ansible-builder==3.1.0 +dumb-init==1.2.2 diff --git a/requirements.yml b/requirements.yml index 1be003745..f9e9acdb1 100644 --- a/requirements.yml +++ b/requirements.yml @@ -15,7 +15,11 @@ # under the License. collections: - - ansible.posix - - community.general - - containers.podman - - fedora.linux_system_roles + - name: ansible.posix + version: 1.2.0 + - name: community.general + version: 4.0.0 + - name: containers.podman + version: 1.10.4 + - name: fedora.linux_system_roles + version: 1.23.0