Skip to content

Commit 57d28ef

Browse files
committed
docs: Update README
1 parent a418df2 commit 57d28ef

File tree

8 files changed

+79
-20
lines changed

8 files changed

+79
-20
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ title: ""
55
labels: ""
66
assignees: ""
77
---
8-
> [!WARNING]
8+
> [!CAUTION]
99
> Remember to redact any sensitive information such as authentication credentials or license keys.
1010
1111
### Describe the bug

.github/workflows/galaxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
python-version: 3.x
2020

2121
- name: Install Ansible core
22-
run: pip3 install -r .github/workflows/requirements/requirements_galaxy.txt
22+
run: pip3 install -r .github/workflows/requirements/requirements_ansible.txt
2323

2424
- name: Import role releases to Ansible Galaxy
2525
run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)

.github/workflows/molecule.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run: pip3 install -r .github/workflows/requirements/requirements_ansible_lint.txt
2828

2929
- name: Install Ansible core collection dependencies
30-
run: ansible-galaxy install -r .github/workflows/requirements/requirements_ansible.yml
30+
run: ansible-galaxy install -r .github/workflows/requirements/requirements_collections.yml
3131

3232
- name: Run Ansible Lint
3333
run: ansible-lint --force-color
@@ -81,7 +81,7 @@ jobs:
8181

8282
- name: Install Ansible core collection dependencies
8383
if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
84-
run: ansible-galaxy install -r .github/workflows/requirements/requirements_ansible.yml
84+
run: ansible-galaxy install -r .github/workflows/requirements/requirements_collections.yml
8585

8686
- name: Run Molecule tests
8787
if: ${{ !(contains(matrix.scenario, 'plus')) || (env.NGINX_CRT != 0 && env.NGINX_KEY != 0) }}
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
ansible-core==2.16.6
2+
jinja2==3.1.4

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ FEATURES:
1414
DOCUMENTATION:
1515

1616
- Update community docs per the latest [NGINX template repository](https://github.com/nginxinc/template-repository) guidelines.
17+
- Update and tweak the README.
1718

1819
CI/CD:
1920

CONTRIBUTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ To suggest a feature or enhancement, please create an issue on GitHub with the l
4545
- Fork the repo, create a branch, implement your changes, add any relevant tests, and submit a PR when your changes are **tested** (using Molecule) and ready for review.
4646
- Fill in the [PR template](/.github/pull_request_template.md).
4747

48-
**Note:** If you'd like to implement a new feature, please consider creating a [feature request issue](/.github/feature_request_template.md) first to start a discussion about the feature.
48+
> [!NOTE]
49+
> If you'd like to implement a new feature, please consider creating a [feature request issue](/.github/feature_request_template.md) first to start a discussion about the feature.
4950
5051
#### F5 Contributor License Agreement (CLA)
5152

README.md

Lines changed: 71 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,36 @@
1111

1212
This role installs NGINX Open Source, NGINX Plus, NGINX Agent or the NGINX Amplify agent on your target host.
1313

14-
**Note:** This role is still in active development. There may be unidentified issues and the role variables may change as development continues.
14+
> [!IMPORTANT]
15+
> This role is still in active development. There may be unidentified issues and the role variables may change as development continues.
1516
16-
## Requirements
17+
## Role Requirements
1718

18-
### NGINX Plus (Optional)
19+
### NGINX
1920

20-
If you wish to install NGINX Plus using this role, you will need to obtain an NGINX Plus license beforehand. *You do not need to do anything beforehand if you want to install NGINX OSS.*
21+
Depending on your target NGINX use case, you might need to obtain some data before being able to use the role.
22+
23+
#### NGINX Open Source (NGINX OSS)
24+
25+
You do not need to do anything beforehand if you want to install NGINX OSS.
26+
27+
#### NGINX Plus
28+
29+
If you wish to install NGINX Plus using this role, you will need to obtain an NGINX Plus license beforehand.
30+
31+
#### NGINX Agent
32+
33+
If you wish to install and configure the NGINX Agent, you will need: to have previously set up a compatible control plane. Check out the [NGINX Agent docs](https://docs.nginx.com/nginx-agent/overview/) for more info.
34+
35+
In addition, if you wish to connect the NGINX Agent to the NGINX One SaaS control plane available in the F5 Distributed Cloud, you will also need the data plane token provided by the NGINX One SaaS control plane.
36+
37+
#### NGINX Amplify
38+
39+
If you wish to install the NGINX Amplify agent, you will need the API key provided within the NGINX Amplify SaaS console.
2140

2241
### Ansible
2342

24-
- This role is developed and tested with [maintained](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html) versions of Ansible core (above `2.12`).
43+
- This role is developed and tested with [maintained](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html) versions of Ansible core and Python.
2544
- When using Ansible core, you will also need to install the following collections:
2645

2746
```yaml
@@ -37,20 +56,49 @@ If you wish to install NGINX Plus using this role, you will need to obtain an NG
3756
version: 3.10.3
3857
```
3958
40-
**Note:** You can alternatively install the Ansible community distribution (what is known as the "old" Ansible) if you don't want to manage individual collections.
59+
> [!TIP]
60+
> You can alternatively install the Ansible community distribution (what is known as the "old" Ansible) if you don't want to manage individual collections.
4161
- You will need to run this role as a root user using Ansible's `become` parameter. Make sure you have set up the appropriate permissions on your target hosts.
4262
- Instructions on how to install Ansible can be found in the [Ansible website](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html#upgrading-ansible-from-version-2-9-and-older-to-version-2-10-or-later).
4363

44-
### Jinja2
64+
#### Jinja2
4565

4666
- This role uses Jinja2 templates. Ansible core installs Jinja2 by default, but depending on your install and/or upgrade path, you might be running an outdated version of Jinja2. The minimum version of Jinja2 required for the role to properly function is `3.1`.
4767
- Instructions on how to install Jinja2 can be found in the [Jinja2 website](https://jinja.palletsprojects.com/en/3.1.x/intro/#installation).
4868

49-
### Molecule (Optional)
69+
Alternatively, you can install `ansible-core`, a supported version of Jinja2, and the aforementioned collections by running the following three commands on your Ansible host:
70+
71+
```bash
72+
pip install -r https://raw.githubusercontent.com/nginxinc/ansible-role-nginx/main/.github/workflows/requirements/requirements_ansible.txt
73+
curl -O https://raw.githubusercontent.com/nginxinc/ansible-role-nginx/main/.github/workflows/requirements/requirements_collections.yml
74+
ansible-galaxy install -r requirements_collections.yml
75+
```
76+
77+
### Testing suite (Optional)
78+
79+
If you want to contribute to this role, you will also need to install Ansible Lint and Molecule.
5080

51-
- Molecule is used to test the various functionalities of the role. The recommended version of Molecule to test this role is `4.x`.
52-
- Instructions on how to install Molecule can be found in the [Molecule website](https://molecule.readthedocs.io/en/latest/installation.html). *You will also need to install the Molecule Docker driver.*
53-
- To run the NGINX Plus Molecule tests, you must copy your NGINX Plus license to the role's [`files/license`](https://github.com/nginxinc/ansible-role-nginx/blob/main/files/license/) directory.
81+
#### Ansible Lint (Optional)
82+
83+
- Ansible Lint is used to lint the role for both Ansible best practices and potential Ansible/YAML issues.
84+
- Instructions on how to install Ansible Lint can be found in the [Ansible Lint website](https://ansible.readthedocs.io/projects/lint/installing/).
85+
- Once installed, using Ansible Lint is as easy as running:
86+
87+
```bash
88+
ansible-lint
89+
```
90+
91+
Alternatively, you can install Ansible Lint by running the following command on your Ansible host:
92+
93+
```bash
94+
pip install -r https://raw.githubusercontent.com/nginxinc/ansible-role-nginx/main/.github/workflows/requirements/requirements_ansible_lint.txt
95+
```
96+
97+
#### Molecule (Optional)
98+
99+
- Molecule is used to test the various functionalities of the role.
100+
- Instructions on how to install Molecule can be found in the [Molecule website](https://molecule.readthedocs.io/en/latest/installation.html). *You will also need to install the Molecule plugins package and the Docker Python SDK.*
101+
- To run any of the NGINX Plus Molecule tests, you must first copy your NGINX Plus license to the role's [`files/license`](https://github.com/nginxinc/ansible-role-nginx/blob/main/files/license/) directory.
54102

55103
You can alternatively add your NGINX Plus repository certificate and key to the local environment. Run the following commands to export these files as base64-encoded variables and execute the Molecule tests:
56104

@@ -60,9 +108,15 @@ If you wish to install NGINX Plus using this role, you will need to obtain an NG
60108
molecule test -s plus
61109
```
62110

63-
## Installation
111+
Alternatively, you can install Molecule and the aforementioned Molecule plugins and Docker Python SDK packages by running the following command on your Ansible host:
112+
113+
```bash
114+
pip install -r https://raw.githubusercontent.com/nginxinc/ansible-role-nginx/main/.github/workflows/requirements/requirements_molecule.txt
115+
```
116+
117+
## Role Installation
64118

65-
This role can be installed via either Ansible Galaxy (the Ansible community marketplace) or by cloning this repo. Once installed, you will need to include the role it in your Ansible playbook using [the `roles` keyword, the `import_role` module, or the `include_role` module](https://docs.ansible.com/ansible/latest/playbook_guide/playbooks_reuse_roles.html#using-roles).
119+
This role can be installed via either Ansible Galaxy (the Ansible community marketplace) or by cloning this repo. Once installed, you will need to include the role in your Ansible playbook using [the `roles` keyword, the `import_role` module, or the `include_role` module](https://docs.ansible.com/ansible/latest/playbook_guide/playbooks_reuse_roles.html#using-roles).
66120

67121
### Ansible Galaxy
68122

@@ -234,7 +288,8 @@ Ubuntu:
234288
- jammy (22.04)
235289
```
236290

237-
**Note:** At your own risk, you can also use this role to compile NGINX Open Source from source, install NGINX Open Source on "compatible" yet unsupported platforms, install NGINX from your respective distribution package manager, or install NGINX Open Source on BSD systems.
291+
> [!WARNing]
292+
> At your own risk, you can also use this role to compile NGINX Open Source from source, install NGINX Open Source on "compatible" yet unsupported platforms, install NGINX from your respective distribution package manager, or install NGINX Open Source on BSD systems.
238293

239294
## Role Variables
240295

@@ -277,7 +332,8 @@ Working functional playbook examples can be found in the **[`molecule/`](https:/
277332
| **[`upgrade-plus/converge.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/molecule/upgrade-plus/converge.yml)** | Upgrade NGINX Plus |
278333
| **[`version/converge.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/molecule/version/converge.yml)** | Install a specific version of NGINX and various NGINX modules |
279334

280-
**Note:** If you install this repository via Ansible Galaxy, you will need to replace the `include_role` variable in the example playbooks from `ansible-role-nginx` to `nginxinc.nginx`.
335+
> [!NOTE]
336+
> If you install this repository via Ansible Galaxy, you will need to replace the `include_role` variable in the example playbooks from `ansible-role-nginx` to `nginxinc.nginx`.
281337

282338
## Other NGINX Ansible Collections and Roles
283339

0 commit comments

Comments
 (0)