Skip to content

Commit

Permalink
Use collections (#1000)
Browse files Browse the repository at this point in the history
* Use collections

Move to use collections, this is to conclude the migration of roles to
the redhatci.ocp collection.
Add the steps and changes required to consume collections.
Remove the submodule for containers.podman and use a newer version.
Update the docs to make clear the playbook is using collections.

* Install collection dependency in GH workflow
  • Loading branch information
tonyskapunk authored Jan 3, 2024
1 parent 6efddca commit d433c3f
Show file tree
Hide file tree
Showing 69 changed files with 30 additions and 6,699 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ansible-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
pip install flake8 pytest
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
if [ -f test-requirements.txt ]; then pip install -r test-requirements.txt; fi
ansible-galaxy collection install -r ansible-ipi-install/requirements.yml
- name: Lint Ansible Playbook
run: |
Expand Down
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
[submodule "ansible-ipi-install/collections/ansible_collections/containers/podman"]
path = ansible-ipi-install/collections/ansible_collections/containers/podman
url = https://github.com/containers/ansible-podman-collections.git
shallow = true
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ This repository stores resources and deployment artifacts for [bare metal](https

It also contains optional features focused on low-latency workloads, NFV workloads, etc.

For contributions to the ansible-ipi-install roles please visit the [ansible-collection-redhatci-ocp](https://github.com/redhatci/ansible-collection-redhatci-ocp) repository.

## Installation artifacts

- [Installation Steps](https://openshift-kni.github.io/baremetal-deploy/)
Expand Down
Submodule podman deleted from ed3a3d
2 changes: 2 additions & 0 deletions ansible-ipi-install/playbook.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
- name: IPI on Baremetal Installation Playbook
hosts: provisioner
collections:
- redhatci.ocp
roles:
- node_prep
- installer
Expand Down
5 changes: 5 additions & 0 deletions ansible-ipi-install/requirements.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
collections:
- name: redhatci.ocp
- name: containers.podman
version: "1.10.1"
17 changes: 0 additions & 17 deletions ansible-ipi-install/roles/installer/defaults/main.yml

This file was deleted.

Empty file.

This file was deleted.

Loading

0 comments on commit d433c3f

Please sign in to comment.