Skip to content

Commit 45029d9

Browse files
authored
Fix license removal step (#122)
* fix error caused by wrong playbook path * describe issue * set default test to use default of remove license
1 parent 1d91553 commit 45029d9

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 0.6.1 (Unreleased)
4+
5+
BUG FIXES:
6+
7+
Role was failing at license and repo removal step when using the default of `nginx_app_protect_remove_license: true`.
8+
39
## 0.6.0 (July 13, 2021)
410

511
BREAKING CHANGES:

molecule/default/prepare.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
nginx_enable: true
2828
nginx_start: true
2929
nginx_type: plus
30-
nginx_remove_license: false
3130
nginx_license:
3231
certificate: ../../files/license/nginx-repo.crt
3332
key: ../../files/license/nginx-repo.key

tasks/common/install/remove-license.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@
33
set_fact:
44
nginx_app_protect_license_status: absent
55

6-
- name: Delete repository data
7-
include_tasks: "{{ role_path }}/tasks/install/install-{{ ansible_os_family | lower }}.yml"
6+
- name: Delete NGINX App Protect WAF repository data
7+
include_tasks: "{{ role_path }}/tasks/waf/install/install-{{ ansible_os_family | lower }}.yml"
8+
when: nginx_app_protect_waf_enable | bool
9+
10+
- name: Delete NGINX App Protect DoS repository data
11+
include_tasks: "{{ role_path }}/tasks/dos/install/install-{{ ansible_os_family | lower }}.yml"
12+
when: nginx_app_protect_dos_enable | bool
813

914
- name: Delete NGINX App Protect license
1015
file:

0 commit comments

Comments
 (0)