diff --git a/.github/workflows/os_builder.yaml b/.github/workflows/os_builder.yaml index a39f416..4c404f1 100644 --- a/.github/workflows/os_builder.yaml +++ b/.github/workflows/os_builder.yaml @@ -34,7 +34,7 @@ jobs: sudo apt-get update sudo apt-get install -y ansible cd os_builders - ansible-playbook -i inventory/localhost.yml prep_builder.yml + ansible-playbook -i inventory/localhost.yml playbooks/prep_builder.yml - name: Validate packer files run: | @@ -62,7 +62,7 @@ jobs: # Patch the inventory to run on this machine run: | cd os_builders && sed -i 's/all/default/g' inventory/localhost.yml - ansible-playbook -i inventory/localhost.yml provision_image.yml --extra-vars provision_this_machine=True + ansible-playbook -i inventory/localhost.yml playbooks/provision_image.yml --extra-vars provision_this_machine=True test_image_prep_rocky: strategy: @@ -79,4 +79,4 @@ jobs: - name: Run pre-prep playbook run: | cd os_builders && sed -i 's/all/default/g' inventory/localhost.yml - ansible-playbook -i inventory/localhost.yml provision_image.yml --extra-vars provision_this_machine=True + ansible-playbook -i inventory/localhost.yml playbooks/provision_image.yml --extra-vars provision_this_machine=True diff --git a/os_builders/galaxy.yml b/os_builders/galaxy.yml new file mode 100644 index 0000000..70635b4 --- /dev/null +++ b/os_builders/galaxy.yml @@ -0,0 +1,57 @@ +### REQUIRED + +# The namespace of the collection. This can be a company/brand/organization or product namespace under which all +# content lives. May only contain alphanumeric lowercase characters and underscores. Namespaces cannot start with +# underscores or numbers and cannot contain consecutive underscores +namespace: stfc_cloud + +# The name of the collection. Has the same character restrictions as 'namespace' +name: compliance + +# The version of the collection. Must be compatible with semantic versioning +version: 0.1.0 + +# The path to the Markdown (.md) readme file. This path is relative to the root of the collection +readme: README.md + +# A list of the collection's content authors. Can be just the name or in the format 'Full Name (url) +# @nicks:irc/im.site#channel' +authors: +- STFC Cloud Team - (cloud-support@stfc.ac.uk) + + +### OPTIONAL but strongly recommended + +# A short summary description of the collection +description: A collection of configuration options for STFC Cloud security compliance and modifications + +# Either a single license or a list of licenses for content inside of a collection. Ansible Galaxy currently only +# accepts L(SPDX,https://spdx.org/licenses/) licenses. This key is mutually exclusive with 'license_file' +license: +- GPL-2.0-or-later + +# The path to the license file for the collection. This path is relative to the root of the collection. This key is +# mutually exclusive with 'license' +license_file: '' + +# A list of tags you want to associate with the collection for indexing/searching. A tag name has the same character +# requirements as 'namespace' and 'name' +tags: [] + +# Collections that this collection requires to be installed for it to be usable. The key of the dict is the +# collection label 'namespace.name'. The value is a version range +# L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version +# range specifiers can be set and are separated by ',' +dependencies: {} + +# The URL of the originating SCM repository +repository: https://github.com/stfc/cloud-image-builders/tree/main/os_builders + +# The URL to any online docs +documentation: https://github.com/stfc/cloud-image-builders/tree/main/os_builders + +# The URL to the homepage of the collection/project +homepage: https://github.com/stfc/cloud-image-builders/tree/main/os_builders + +# The URL to the collection issue tracker +issues: https://github.com/stfc/cloud-image-builders/issues diff --git a/os_builders/builder.yml b/os_builders/playbooks/builder.yml similarity index 100% rename from os_builders/builder.yml rename to os_builders/playbooks/builder.yml diff --git a/os_builders/prep_builder.yml b/os_builders/playbooks/prep_builder.yml similarity index 100% rename from os_builders/prep_builder.yml rename to os_builders/playbooks/prep_builder.yml diff --git a/os_builders/prepare_user_image.yml b/os_builders/playbooks/prepare_user_image.yml similarity index 100% rename from os_builders/prepare_user_image.yml rename to os_builders/playbooks/prepare_user_image.yml diff --git a/os_builders/provision_image.yml b/os_builders/playbooks/provision_image.yml similarity index 100% rename from os_builders/provision_image.yml rename to os_builders/playbooks/provision_image.yml