Skip to content

Commit

Permalink
Merge pull request #42 from nofusscomputing/37-api-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
jon-nfc authored Dec 31, 2024
2 parents b1a1839 + fa10637 commit 1d01c65
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name: 'CI'


on:
pull_request:
types:
- synchronize
# pull_request:
# types:
# - synchronize
push:
branches:
- '**'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@ The inventory playbook includes the [AWX Feature](../../../playbooks/awx.md) to

The following job template will be created:

* **Centurion/ITAM/Inventory** Inventory host machines and publish to Centurion ERP
- **Centurion/ITAM/Inventory** Inventory host machines and publish to Centurion ERP

On import to AWX / Ansible Automation Platform a credential type will also be created, 'Collection/No Fuss Computing/Centurion/API' that can be used to supply the required secrets and Centurion host.


!!! warning
The inventory playbook currently has an issue relating to gathering software starting with L. This issue has been reported and is being worked on
[github issue 19](https://github.com/nofusscomputing/ansible_collection_centurion/issues/19)
The inventory playbook currently has an issue relating to gathering software starting with L. This issue has been reported and is being worked on [github issue 19](https://github.com/nofusscomputing/ansible_collection_centurion/issues/19)


## Play workflow
Expand All @@ -33,4 +32,3 @@ The inventory playbook conducts the follwoing tasks:
- Uploads the inventory report to Centurion ERP

- Cleans any leftover files used to create the reports

9 changes: 5 additions & 4 deletions docs/projects/ansible/collection/centurion/playbooks/teams.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ The teams playbook includes the [AWX Feature](../../../playbooks/awx.md) to impo

The following job template will be created:

* **Centurion/Access/Teams** Creation and patching of teams and permissions
- **Centurion/Access/Teams** Creation and patching of teams and permissions


!!! info
!!! info
The playbook is able to work with the [inventory plugin](../plugins/index.md) that is included in this collection.


Expand Down Expand Up @@ -56,7 +56,8 @@ centurion_erp:

!!! tip "common teams"
Common teams can be created by using yaml anchors. This is useful when multiple organisations require a common team and permissions to be set.

<!-- markdownlint-disable -->
<!-- markdownlint-disable-next-line code-block-style -->
```yaml
centurion_erp:
common_teams:
Expand All @@ -72,4 +73,4 @@ centurion_erp:
notes: *team-name-notes

```

<!-- markdownlint-restore -->
3 changes: 1 addition & 2 deletions playbooks/inventory.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
- name: Upload inventory - {{ ansible_hostname }}
ansible.builtin.uri:
url: |-
{{ lookup('env', 'ITSM_API') }}/api/device/inventory
{{ lookup('env', 'ITSM_API') }}/api/v2/itam/inventory
method: POST
body_format: json
Expand Down Expand Up @@ -173,4 +173,3 @@
CENTURION_API: '{{ centurion_url }}'
CENTURION_TOKEN: '{{ centurion_token }}'
CENTURION_VALIDATE_CERTS: '{{ centurion_validate_certs | default(true) }}'
5 changes: 2 additions & 3 deletions playbooks/teams.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
- name: Collect organizations from centurion ERP

Check warning on line 33 in playbooks/teams.yaml

View workflow job for this annotation

GitHub Actions / Ansible Collection / Lint

run-once[task]

Using run_once may behave differently if strategy is set to free.
ansible.builtin.uri:
url: |-
{{ lookup('env', 'CENTURION_API') }}/api/organization/
{{ lookup('env', 'CENTURION_API') }}/api/v2/access/organization/
method: GET
body_format: json
headers:
Expand Down Expand Up @@ -135,7 +135,7 @@
- name: Create new teams in centurion_ERP

Check warning on line 135 in playbooks/teams.yaml

View workflow job for this annotation

GitHub Actions / Ansible Collection / Lint

run-once[task]

Using run_once may behave differently if strategy is set to free.
ansible.builtin.uri:
url: |-
{{ lookup('env', 'CENTURION_API') }}/api/organization/{{ item.organization_id }}/team
{{ lookup('env', 'CENTURION_API') }}/api/v2/access/organization/{{ item.organization_id }}/team
method: POST
body_format: json
body: |-
Expand Down Expand Up @@ -265,4 +265,3 @@
- permissions
- teams
use_fact_cache: true

0 comments on commit 1d01c65

Please sign in to comment.