Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update README and resolve CI Fail #98

Merged
merged 4 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,31 +216,6 @@ Working functional playbook examples can be found in the **[`molecule/`](https:/

Do note that if you install this repository via Ansible Galaxy, you will have to replace the role variable in the sample playbooks from `ansible-role-nginx-management-suite` to `nginxinc.nginx_management_suite`.

## NGINX Plus Counting

You can use this role to help count the number of NGINX Plus instance you have.

### Requirement

You will also need to install the following collection in order to use the example playbooks for counting NGINX Plus instances.

```yaml
collections:
- name: https://github.com/TuxInvader/ansible_collection_nginx_management_suite.git
type: git
version: main
```

### Example NGINX Plus Count Playbook

Example playbooks are also tested as a part of this role and can be found in the table below.

| Name | Description |
| ---- | ----------- |
| **[`plus-count-ubuntu/converge.yml`](https://github.com/nginxinc/ansible-role-nginx-management-suite/blob/main/molecule/plus-count-ubuntu/converge.yml)** | Install NMS and NGINX Agent on NGINX Plus instances using an Ubuntu NMS Host |
| **[`plus-count-rhel/converge.yml`](https://github.com/nginxinc/ansible-role-nginx-management-suite/blob/main/molecule/plus-count-rhel/converge.yml)** | Install NMS and NGINX Agent on NGINX Plus instances using a RHEL NMS Host |
| **[`plus-count-upgrade/converge.yml`](https://github.com/nginxinc/ansible-role-nginx-management-suite/blob/main/molecule/plus-count-rhel/converge.yml)** | Upgrade NMS and NGINX Agent on NGINX Plus instances using aN Ubuntu NMS Host |

## Other NGINX Ansible Collections and Roles

You can find the Ansible NGINX Core collection of roles to install and configure NGINX Open Source, NGINX Plus, and NGINX App Protect [here](https://github.com/nginxinc/ansible-collection-nginx).
Expand Down
24 changes: 24 additions & 0 deletions docs/nginx-plus-count.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# NGINX Plus Counting

You can use this role to help count the number of NGINX Plus instance you have.

## Requirement

You will also need to install the following collection in order to use the example playbooks for counting NGINX Plus instances.

```yaml
collections:
- name: https://github.com/TuxInvader/ansible_collection_nginx_management_suite.git
type: git
version: main
```

## Example NGINX Plus Count Playbook

Example playbooks are also tested as a part of this role and can be found in the table below.

| Name | Description |
| ---- | ----------- |
| **[`plus-count-ubuntu/converge.yml`](https://github.com/nginxinc/ansible-role-nginx-management-suite/blob/main/molecule/plus-count-ubuntu/converge.yml)** | Install NMS and NGINX Agent on NGINX Plus instances using an Ubuntu NMS Host |
| **[`plus-count-rhel/converge.yml`](https://github.com/nginxinc/ansible-role-nginx-management-suite/blob/main/molecule/plus-count-rhel/converge.yml)** | Install NMS and NGINX Agent on NGINX Plus instances using a RHEL NMS Host |
| **[`plus-count-upgrade/converge.yml`](https://github.com/nginxinc/ansible-role-nginx-management-suite/blob/main/molecule/plus-count-rhel/converge.yml)** | Upgrade NMS and NGINX Agent on NGINX Plus instances using aN Ubuntu NMS Host |
21 changes: 3 additions & 18 deletions molecule/plus-count-rhel/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ platforms:
- name: bridge
- name: hostname_network
command: /usr/sbin/init
- name: debian-buster
image: debian:buster-slim
- name: debian-bookworm
image: debian:bookworm-slim
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
Expand All @@ -139,7 +139,7 @@ platforms:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
groups:
- data
- data_r24
- data_r31
networks:
- name: bridge
- name: hostname_network
Expand All @@ -159,21 +159,6 @@ platforms:
- name: bridge
- name: hostname_network
command: /sbin/init
- name: ubuntu-bionic
image: ubuntu:bionic
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
groups:
- data
- data_r24
networks:
- name: bridge
- name: hostname_network
command: /sbin/init
- name: ubuntu-focal
image: ubuntu:focal
platform: x86_64
Expand Down
6 changes: 3 additions & 3 deletions molecule/plus-count-rhel/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
key: "{{ playbook_dir }}/../../files/license/nginx-repo.key"


- name: Prepare NGINX Plus Data Hosts R24
hosts: data_r24
- name: Prepare NGINX Plus Data Hosts R31
hosts: data_r31
tasks:
- name: Install NGINX Plus
ansible.builtin.include_role:
Expand All @@ -92,7 +92,7 @@
nginx_selinux: true
nginx_selinux_enforcing: false
nginx_type: plus
nginx_version: =24*
nginx_version: =31*
nginx_remove_license: false
nginx_license:
certificate: "{{ playbook_dir }}/../../files/license/nginx-repo.crt"
Expand Down
21 changes: 3 additions & 18 deletions molecule/plus-count-ubuntu/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ platforms:
- name: bridge
- name: hostname_network
command: /usr/sbin/init
- name: debian-buster
image: debian:buster-slim
- name: debian-bookworm
image: debian:bookworm-slim
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
Expand All @@ -139,7 +139,7 @@ platforms:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
groups:
- data
- data_r24
- data_r31
networks:
- name: bridge
- name: hostname_network
Expand All @@ -159,21 +159,6 @@ platforms:
- name: bridge
- name: hostname_network
command: /sbin/init
- name: ubuntu-bionic
image: ubuntu:bionic
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
groups:
- data
- data_r24
networks:
- name: bridge
- name: hostname_network
command: /sbin/init
- name: ubuntu-focal
image: ubuntu:focal
platform: x86_64
Expand Down
6 changes: 3 additions & 3 deletions molecule/plus-count-ubuntu/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
key: "{{ playbook_dir }}/../../files/license/nginx-repo.key"


- name: Prepare NGINX Plus Data Hosts R24
hosts: data_r24
- name: Prepare NGINX Plus Data Hosts R31
hosts: data_r31
tasks:
- name: Install NGINX Plus
ansible.builtin.include_role:
Expand All @@ -92,7 +92,7 @@
nginx_selinux: true
nginx_selinux_enforcing: false
nginx_type: plus
nginx_version: =24*
nginx_version: =31*
nginx_remove_license: false
nginx_license:
certificate: "{{ playbook_dir }}/../../files/license/nginx-repo.crt"
Expand Down
Loading