From f73580f43b4d971882521db7193192009c0b6653 Mon Sep 17 00:00:00 2001 From: John Wong Date: Mon, 29 Apr 2024 12:10:53 -0700 Subject: [PATCH 1/4] Debian 10 (buster) is no longer supported, trying to update testing to use version 12 (bookworm) --- molecule/plus-count-rhel/molecule.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/molecule/plus-count-rhel/molecule.yml b/molecule/plus-count-rhel/molecule.yml index 98cd6c1..05e2e90 100644 --- a/molecule/plus-count-rhel/molecule.yml +++ b/molecule/plus-count-rhel/molecule.yml @@ -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 From 59b607e1914b2884bb45cc2f55e6cc1bf5fe751a Mon Sep 17 00:00:00 2001 From: John Wong Date: Mon, 29 Apr 2024 12:12:04 -0700 Subject: [PATCH 2/4] Removing example for using 'count NGINX Plus' playbook. Moved to another file to keep instructions --- README.md | 25 ------------------------- docs/nginx-plus-count.md | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 25 deletions(-) create mode 100644 docs/nginx-plus-count.md diff --git a/README.md b/README.md index 4b0ad59..101996e 100644 --- a/README.md +++ b/README.md @@ -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). diff --git a/docs/nginx-plus-count.md b/docs/nginx-plus-count.md new file mode 100644 index 0000000..020350f --- /dev/null +++ b/docs/nginx-plus-count.md @@ -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 | From ed3fffc323a643a277a38cbbf5b3cc9190921749 Mon Sep 17 00:00:00 2001 From: John Wong Date: Mon, 29 Apr 2024 13:28:43 -0700 Subject: [PATCH 3/4] Ubuntu 18 is also deprecated on later NMS versions --- molecule/plus-count-rhel/molecule.yml | 17 +---------------- molecule/plus-count-ubuntu/molecule.yml | 19 ++----------------- molecule/plus-count-ubuntu/prepare.yml | 6 +++--- 3 files changed, 6 insertions(+), 36 deletions(-) diff --git a/molecule/plus-count-rhel/molecule.yml b/molecule/plus-count-rhel/molecule.yml index 05e2e90..6d29c7a 100644 --- a/molecule/plus-count-rhel/molecule.yml +++ b/molecule/plus-count-rhel/molecule.yml @@ -139,7 +139,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw groups: - data - - data_r24 + - data_r31 networks: - name: bridge - name: hostname_network @@ -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 diff --git a/molecule/plus-count-ubuntu/molecule.yml b/molecule/plus-count-ubuntu/molecule.yml index ae9af48..5a1b3b8 100644 --- a/molecule/plus-count-ubuntu/molecule.yml +++ b/molecule/plus-count-ubuntu/molecule.yml @@ -129,7 +129,7 @@ platforms: - name: bridge - name: hostname_network command: /usr/sbin/init - - name: debian-buster + - name: debian-bookworm image: debian:buster-slim platform: x86_64 dockerfile: ../common/Dockerfile.j2 @@ -139,7 +139,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw groups: - data - - data_r24 + - data_r31 networks: - name: bridge - name: hostname_network @@ -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 diff --git a/molecule/plus-count-ubuntu/prepare.yml b/molecule/plus-count-ubuntu/prepare.yml index eb1b21b..7a10abe 100644 --- a/molecule/plus-count-ubuntu/prepare.yml +++ b/molecule/plus-count-ubuntu/prepare.yml @@ -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: @@ -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" From 9e037b18ce12316d479ebb6e52b0f1296302e433 Mon Sep 17 00:00:00 2001 From: John Wong Date: Mon, 29 Apr 2024 14:13:17 -0700 Subject: [PATCH 4/4] Resolving errors --- molecule/plus-count-rhel/prepare.yml | 6 +++--- molecule/plus-count-ubuntu/molecule.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/molecule/plus-count-rhel/prepare.yml b/molecule/plus-count-rhel/prepare.yml index eb1b21b..7a10abe 100644 --- a/molecule/plus-count-rhel/prepare.yml +++ b/molecule/plus-count-rhel/prepare.yml @@ -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: @@ -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" diff --git a/molecule/plus-count-ubuntu/molecule.yml b/molecule/plus-count-ubuntu/molecule.yml index 5a1b3b8..7158330 100644 --- a/molecule/plus-count-ubuntu/molecule.yml +++ b/molecule/plus-count-ubuntu/molecule.yml @@ -130,7 +130,7 @@ platforms: - name: hostname_network command: /usr/sbin/init - name: debian-bookworm - image: debian:buster-slim + image: debian:bookworm-slim platform: x86_64 dockerfile: ../common/Dockerfile.j2 privileged: true