diff --git a/collections/requirements.yml b/collections/requirements.yml index 404a5b42..31caa459 100644 --- a/collections/requirements.yml +++ b/collections/requirements.yml @@ -1,22 +1,25 @@ --- collections: - - # name: community.general - source: https://github.com/ansible-collections/community.general.git - type: git + - name: community.general + # source: https://github.com/ansible-collections/community.general.git + # type: git version: 10.1.0 - - # name: ansible.posix - source: https://github.com/ansible-collections/ansible.posix.git - type: git + - name: ansible.posix + # source: https://github.com/ansible-collections/ansible.posix.git + # type: git version: 1.5.1 - - # name: containers.podman - source: https://github.com/containers/ansible-podman-collections.git - type: git + - name: containers.podman + # source: https://github.com/containers/ansible-podman-collections.git + # type: git version: 1.16.2 - # name: nsls2.general source: https://github.com/nsls2/nsls2.general.git type: git - - # name: awx.awx - source: https://github.com/nsls2/awx.git - type: git - version: nsls-ii-prod + # - # name: awx.awx + # source: https://github.com/nsls2/awx.git + # type: git + # version: nsls-ii-prod + - name: community.docker + # source: + version: 3.4.9 diff --git a/scripts/deploy_local_config.py b/scripts/deploy_local_config.py index 48ea99ff..1c78e4e7 100755 --- a/scripts/deploy_local_config.py +++ b/scripts/deploy_local_config.py @@ -144,7 +144,7 @@ def install_galaxy_collection( cmd.extend(["-p", str(collections_path.absolute())]) try: logger.info(f"Installing required ansible-galaxy collection(s): {name}") - subprocess.run(cmd, capture_output=True, text=True, check=True) + subprocess.run(cmd, check=True) except subprocess.CalledProcessError as e: raise RuntimeError(f"Failed to install galaxy collection {name}: {e}") from e @@ -369,9 +369,6 @@ def main(): ) install_galaxy_collection(str(top_path), force=True) - if args.container: - install_galaxy_collection("community.docker") - if args.all: logger.info("Finding all examples for all IOC types") device_roles_path = top_path / "roles/device_roles"