Skip to content

Commit d0548a7

Browse files
authored
Remove NGINX Controller agent tasks (#228)
There's now a separate collection of NGINX Controller roles that can be found at https://github.com/nginxinc/ansible-collection-nginx_controller making the task in this role obsolete
1 parent 5ac8764 commit d0548a7

File tree

9 files changed

+8
-193
lines changed

9 files changed

+8
-193
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Follow our [Installation Guide](https://github.com/nginxinc/ansible-role-nginx/b
2626

2727
### Project Structure
2828

29-
* The NGINX Ansible role is written in `yaml` and supports open source NGINX, NGINX Plus, NGINX Amplify, NGINX Controller, and NGINX Unit.
29+
* The NGINX Ansible role is written in `yaml` and supports open source NGINX, NGINX Plus, NGINX Amplify, and NGINX Unit.
3030
* The project follows the standard [Ansible role directory structure](https://docs.ansible.com/ansible/latest/user_guide/playbooks_reuse_roles.html)
3131
* The main code is found at `tasks/`
3232
* The main variables can be found at `defaults/main/`

README.md

Lines changed: 7 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Ansible NGINX Role
44
[![Ansible Galaxy](https://img.shields.io/badge/galaxy-nginxinc.nginx-5bbdbf.svg)](https://galaxy.ansible.com/nginxinc/nginx)
55
[![Build Status](https://travis-ci.org/nginxinc/ansible-role-nginx.svg?branch=master)](https://travis-ci.org/nginxinc/ansible-role-nginx)
66

7-
This role installs NGINX Open Source, NGINX Plus, the NGINX Amplify agent, the NGINX Controller agent, or NGINX Unit on your target host.
7+
This role installs NGINX Open Source, NGINX Plus, the NGINX Amplify agent, or NGINX Unit on your target host.
88

99
**Note:** This role is still in active development. There may be unidentified issues and the role variables may change as development continues.
1010

@@ -35,7 +35,7 @@ Use `git clone https://github.com/nginxinc/ansible-role-nginx.git` to pull the l
3535
Platforms
3636
---------
3737

38-
The NGINX Ansible role supports all platforms supported by [NGINX Open Source](https://nginx.org/en/linux_packages.html#mainline), [NGINX Plus](https://www.nginx.com/products/technical-specs/), the [NGINX Amplify agent](https://github.com/nginxinc/nginx-amplify-doc/blob/master/amplify-faq.md#21-what-operating-systems-are-supported), the [NGINX Controller agent](https://docs.nginx.com/nginx-controller/technical-specs/#nginx-controller-agent-technical-specifications), and [NGINX Unit](https://unit.nginx.org/installation/#official-packages):
38+
The NGINX Ansible role supports all platforms supported by [NGINX Open Source](https://nginx.org/en/linux_packages.html#mainline), [NGINX Plus](https://www.nginx.com/products/technical-specs/), the [NGINX Amplify agent](https://github.com/nginxinc/nginx-amplify-doc/blob/master/amplify-faq.md#21-what-operating-systems-are-supported), and [NGINX Unit](https://unit.nginx.org/installation/#official-packages):
3939

4040
**NGINX Open Source**
4141

@@ -143,33 +143,6 @@ RedHat:
143143
- 7
144144
```
145145
146-
**NGINX Controller Agent**
147-
148-
```yaml
149-
Amazon Linux:
150-
versions:
151-
- 2017.09
152-
Amazon Linux 2:
153-
versions:
154-
- LTS
155-
CentOS:
156-
versions:
157-
- 6
158-
- 7
159-
Debian:
160-
versions:
161-
- jessie
162-
- stretch
163-
Ubuntu:
164-
versions:
165-
- xenial
166-
- bionic
167-
RedHat:
168-
versions:
169-
- 6
170-
- 7
171-
```
172-
173146
**NGINX Unit**
174147
175148
```yaml
@@ -209,7 +182,6 @@ This role has multiple variables. The descriptions and defaults for all these va
209182

210183
- **[defaults/main/main.yml](./defaults/main/main.yml):** NGINX installation variables
211184
- **[defaults/main/amplify.yml](./defaults/main/amplify.yml):** NGINX Amplify agent installation variables
212-
- **[defaults/main/controller.yml](./defaults/main/controller.yml):** NGINX Controller agent installation variables
213185
- **[defaults/main/template.yml](./defaults/main/template.yml):** NGINX configuration templating variables
214186
- **[defaults/main/upload.yml](./defaults/main/upload.yml):** NGINX configuration/HTML/SSL upload variables
215187
- **[defaults/main/linux.yml](./defaults/main/linux.yml):** Linux installation variables
@@ -400,34 +372,6 @@ This is a sample playbook file for deploying the Ansible Galaxy NGINX role in a
400372
nginx_type: plus
401373
```
402374

403-
This is a sample playbook file for deploying the Ansible Galaxy NGINX role in a localhost to install NGINX Plus and the NGINX Controller agent. Commented out
404-
are sample variables to install the NGINX Controller agent from your NGINX Controller instance instead of the NGINX repository.
405-
406-
```yaml
407-
- hosts: localhost
408-
become: true
409-
roles:
410-
- role: nginxinc.nginx
411-
vars:
412-
nginx_type: plus
413-
nginx_rest_api_enable: true
414-
nginx_rest_api_port: 80
415-
nginx_rest_api_write: true
416-
nginx_controller_enable: true
417-
nginx_controller_source: repository
418-
nginx_controller_api_key: <API_KEY_HERE>
419-
nginx_controller_endpoint: <FQDN> # e.g. controller.nginx.com
420-
# nginx_type: plus
421-
# nginx_rest_api_enable: true
422-
# nginx_rest_api_port: 80
423-
# nginx_rest_api_write: true
424-
# nginx_controller_enable: true
425-
# nginx_controller_source: instance
426-
# nginx_controller_endpoint: controller.nginx.com
427-
# nginx_controller_user_email: [email protected]
428-
# nginx_controller_password: password
429-
```
430-
431375
This is a sample playbook file for deploying the Ansible Galaxy NGINX role in a localhost to install NGINX Unit and the PHP/Perl NGINX Unit language modules.
432376

433377
```yaml
@@ -448,6 +392,11 @@ To run any of the above sample playbooks create a `setup-nginx.yml` file and pas
448392

449393
Alternatively, you can also clone this repository instead of installing it from Ansible Galaxy. If you decide to do so, replace the role variable in the previous sample playbooks from `nginxinc.nginx` to `ansible-role-nginx`.
450394

395+
Other NGINX Roles
396+
-----------------
397+
398+
You can find an Ansible collection of roles to help you install and configure NGINX Controller [here](https://github.com/nginxinc/ansible-collection-nginx_controller)
399+
451400
License
452401
-------
453402

defaults/main/controller.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

handlers/main.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
name: amplify-agent
2323
state: started
2424

25-
- name: "(Handler: All OSs) Start NGINX Controller Agent"
26-
service:
27-
name: controller-agent
28-
state: started
29-
3025
- name: "(Handler: Debian/Ubuntu/CentOS/RedHat) Start NGINX Unit"
3126
service:
3227
name: unit

meta/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
galaxy_info:
3-
role_name: nginx
43
author: Alessandro Fael Garcia
54
description: Official Ansible role for NGINX
65
company: NGINX, Inc.
@@ -43,7 +42,6 @@ galaxy_info:
4342
- oss
4443
- plus
4544
- amplify
46-
- controller
4745
- unit
4846
- web
4947
- server

tasks/controller/install-controller.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

tasks/controller/setup-controller-instance.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

tasks/controller/setup-controller-repository.yml

Lines changed: 0 additions & 50 deletions
This file was deleted.

tasks/main.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
- ansible_os_family == "Debian"
88
- nginx_install_from == "nginx_repository"
99
or nginx_amplify_enable
10-
or nginx_controller_enable
1110
or nginx_unit_enable
1211
tags: nginx_aptkey
1312

@@ -17,7 +16,6 @@
1716
or ansible_os_family == "Suse"
1817
- nginx_install_from == "nginx_repository"
1918
or nginx_amplify_enable
20-
or nginx_controller_enable
2119
or nginx_unit_enable
2220
tags: nginx_rpmkey
2321

@@ -82,13 +80,6 @@
8280
- nginx_amplify_api_key | length > 0
8381
tags: nginx_install_amplify
8482

85-
- import_tasks: controller/install-controller.yml
86-
when:
87-
- nginx_controller_enable | bool
88-
- nginx_controller_endpoint is defined
89-
- nginx_controller_endpoint | length > 0
90-
tags: nginx_install_controller
91-
9283
- import_tasks: unit/install-unit.yml
9384
when: nginx_unit_enable | bool
9485
tags: nginx_install_unit

0 commit comments

Comments
 (0)