Skip to content

Commit 15b5935

Browse files
committed
feat: Add support for installing NGINX Agent on Ubuntu noble (#746)
1 parent 02a9ee6 commit 15b5935

File tree

10 files changed

+19
-10
lines changed

10 files changed

+19
-10
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ BREAKING CHANGES:
1010
FEATURES:
1111

1212
- Add support for installing NGINX Open Source on Alpine Linux 3.20.
13+
- Add support for installing NGINX Agent on Ubuntu noble.
1314

1415
DOCUMENTATION:
1516

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ To use the role, include the following task in your playbook:
156156

157157
## Platforms
158158

159-
The NGINX Ansible role supports almost all platforms supported by [NGINX Open Source](https://nginx.org/en/linux_packages.html), [NGINX Plus](https://docs.nginx.com/nginx/technical-specs/), the [NGINX Agent](https://docs.nginx.com/nginx-agent/technical-specifications/), and the [NGINX Amplify agent](https://github.com/nginxinc/nginx-amplify-doc/blob/master/amplify-faq.md#21-what-operating-systems-are-supported):
159+
The NGINX Ansible role supports almost all platforms supported by [NGINX Open Source](https://nginx.org/en/linux_packages.html), [NGINX Plus](https://docs.nginx.com/nginx/technical-specs/), [NGINX Agent](https://docs.nginx.com/nginx-agent/technical-specifications/), and the [NGINX Amplify agent](https://github.com/nginxinc/nginx-amplify-doc/blob/master/amplify-faq.md#21-what-operating-systems-are-supported):
160160

161161
### NGINX Open Source
162162

@@ -267,6 +267,7 @@ SUSE/SLES:
267267
Ubuntu:
268268
- focal (20.04)
269269
- jammy (22.04)
270+
- noble (24.04)
270271
```
271272

272273
### NGINX Amplify Agent
@@ -315,7 +316,7 @@ Working functional playbook examples can be found in the **[`molecule/`](https:/
315316

316317
| Name | Description |
317318
| ---- | ----------- |
318-
| **[`agent/converge.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/molecule/agent/converge.yml)** | Install and configure the NGINX Agent to connect to the NGINX One SaaS control plane on F5 Distributed Cloud |
319+
| **[`agent/converge.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/molecule/agent/converge.yml)** | Install and configure NGINX Agent to connect to the NGINX One SaaS control plane on F5 Distributed Cloud |
319320
| **[`amplify/converge.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/molecule/amplify/converge.yml)** | Install and configure the NGINX Amplify agent |
320321
| **[`default/converge.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/molecule/default/converge.yml)** | Install a specific version of NGINX, install various NGINX supported modules, tweak systemd and set up logrotate |
321322
| **[`distribution/converge.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/molecule/distribution/converge.yml)** | Install NGINX from the distribution's package repository instead of NGINX's package repository |

molecule/agent/cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
- name: Get list of NGINX One dangling instance IDs
2727
ansible.builtin.uri:
28-
url: https://{{ lookup('env', 'ONE_TENANT') }}.console.ves.volterra.io/api/nginx/one/namespaces/default/instances?paginated=false&filter_fields=hostname&filter_ops=IN&filter_values=almalinux-8|almalinux-9|alpine-3.17|alpine-3.18|alpine-3.19|alpine-3.20|amazonlinux-2|debian-bullseye|debian-bookworm|oraclelinux-8|oraclelinux-9|rhel-8|rhel-9|rockylinux-8|rockylinux-9|sles-15|ubuntu-focal|ubuntu-jammy
28+
url: https://{{ lookup('env', 'ONE_TENANT') }}.console.ves.volterra.io/api/nginx/one/namespaces/default/instances?paginated=false&filter_fields=hostname&filter_ops=IN&filter_values=almalinux-8|almalinux-9|alpine-3.17|alpine-3.18|alpine-3.19|alpine-3.20|amazonlinux-2|debian-bullseye|debian-bookworm|oraclelinux-8|oraclelinux-9|rhel-8|rhel-9|rockylinux-8|rockylinux-9|sles-15|ubuntu-focal|ubuntu-jammy|ubuntu-noble
2929
method: GET
3030
headers:
3131
Authorization: APIToken {{ lookup('env', 'ONE_API_TOKEN') }}

molecule/agent/molecule.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,14 @@ platforms:
156156
volumes:
157157
- /sys/fs/cgroup:/sys/fs/cgroup:rw
158158
command: /sbin/init
159+
- name: ubuntu-noble
160+
image: ubuntu:noble
161+
dockerfile: ../common/Dockerfile.j2
162+
privileged: true
163+
cgroupns_mode: host
164+
volumes:
165+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
166+
command: /sbin/init
159167
provisioner:
160168
name: ansible
161169
log: true

tasks/agent/install-agent.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: Configure NGINX Agent repository
2+
- name: Manage NGINX Agent repository
33
ansible.builtin.include_tasks: "{{ role_path }}/tasks/agent/setup-{{ ansible_facts['os_family'] | lower }}.yml"
44
when: ansible_facts['os_family'] in ['Alpine', 'Debian', 'RedHat', 'Suse']
55

tasks/agent/setup-alpine.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: (Alpine Linux) Add NGINX Agent repository
2+
- name: (Alpine Linux) Configure NGINX Agent repository
33
ansible.builtin.lineinfile:
44
path: /etc/apk/repositories
55
insertafter: EOF

tasks/agent/setup-debian.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: (Debian/Ubuntu) Add NGINX Agent repository
2+
- name: (Debian/Ubuntu) Configure NGINX Agent repository
33
ansible.builtin.apt_repository:
44
filename: nginx-agent
55
repo: deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://packages.nginx.org/nginx-agent/{{ ansible_facts['distribution'] | lower }} {{ ansible_facts['distribution_release'] | lower }} agent

tasks/agent/setup-redhat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: (AlmaLinux/Amazon Linux/Oracle Linux/RHEL/Rocky Linux) Add NGINX Agent repository
2+
- name: (AlmaLinux/Amazon Linux/Oracle Linux/RHEL/Rocky Linux) Configure NGINX Agent repository
33
ansible.builtin.yum_repository:
44
name: nginx-agent
55
file: nginx-agent

tasks/agent/setup-suse.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: (SLES) Add NGINX Agent repository
2+
- name: (SLES) Configure NGINX Agent repository
33
community.general.zypper_repository:
44
name: nginx-agent
55
repo: https://packages.nginx.org/nginx-agent/sles/{{ ansible_facts['distribution_major_version'] }}

tasks/main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,5 @@
8181

8282
- name: Install NGINX Agent
8383
ansible.builtin.include_tasks: "{{ role_path }}/tasks/agent/install-agent.yml"
84-
when:
85-
- nginx_agent_enable | bool
84+
when: nginx_agent_enable | bool
8685
tags: nginx_install_agent

0 commit comments

Comments
 (0)