From 51a024b4f16a473d67f3582319d81fe4be261d7c Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Sat, 1 Jul 2023 19:41:20 +0200 Subject: [PATCH] Use osism.pulp.regio.digital as ansible galaxy source Signed-off-by: Christian Berendt --- files/ansible.cfg | 19 +++++++++++++++++++ files/src/templates/requirements.yml.j2 | 13 +++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/files/ansible.cfg b/files/ansible.cfg index f42f382..8211084 100644 --- a/files/ansible.cfg +++ b/files/ansible.cfg @@ -16,3 +16,22 @@ gathering = smart [ssh_connection] pipelining = true + +# Mirrored content on Pulp can be viewed and extended in the following +# repository: https://github.com/osism/sbom/tree/main/mirrors/pulp +# +# The used account is only assigned viewer rights and we use this to +# provide access not completely public. + +[galaxy] +server_list = ansible_collections,ansible_roles + +[galaxy_server.ansible_collections] +url = http://osism.pulp.regio.digital:8080/pulp_ansible/galaxy/ansible_collections/ +username = ansible_viewer +password = oegei7Ohcem8aej6 + +[galaxy_server.ansible_roles] +url = http://osism.pulp.regio.digital:8080/pulp_ansible/galaxy/ansible_roles/ +username = ansible_viewer +password = oegei7Ohcem8aej6 diff --git a/files/src/templates/requirements.yml.j2 b/files/src/templates/requirements.yml.j2 index b63c52c..98cf705 100644 --- a/files/src/templates/requirements.yml.j2 +++ b/files/src/templates/requirements.yml.j2 @@ -1,6 +1,11 @@ ---- # DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN - +# +# Mirrored content on Pulp can be viewed and extended in the following +# repository: https://github.com/osism/sbom/tree/main/mirrors/pulp +# +# The used account is only assigned viewer rights and we use this to +# provide access not completely public. +--- roles: {% for name in ansible_roles.keys() %} - name: {{ name }} @@ -8,8 +13,6 @@ roles: {% if ansible_role_names[name] %} type: git src: git+https://github.com/{{ ansible_role_names[name] }}.git -{% else %} - source: https://galaxy.ansible.com {% endif %} {% endfor %} @@ -18,7 +21,6 @@ collections: {% if ansible_collection_names[name] %} {% if is_release == "true" and "osism" in name %} - name: {{ name }} - source: https://galaxy.ansible.com version: {{ ansible_collections[name] }} {% else %} - name: https://github.com/{{ ansible_collection_names[name] }}.git @@ -27,7 +29,6 @@ collections: {% endif %} {% else %} - name: {{ name }} - source: https://galaxy.ansible.com version: {{ ansible_collections[name] }} {% endif %} {% endfor %}