Skip to content

Commit d09be43

Browse files
authored
chore: remove adm support and references (#106)
* chore: remove adm support and references * chore: added extra line
1 parent b56179e commit d09be43

File tree

6 files changed

+2
-22
lines changed

6 files changed

+2
-22
lines changed

defaults/main.yml

-9
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,12 @@ nms_modules: []
4242
# - name: acm
4343
# version: ''
4444
# setup: install
45-
# - name: adm
46-
# version: ''
47-
# setup: install
4845
# - name: sm
4946
# version: ''
5047
# setup: install
5148
# - name: acm
5249
# yum_repo: --alt_repo--
5350
# yum_gpgcheck: false
54-
# - name: adm
55-
# yum_repo: --alt_repo--
56-
# yum_gpgcheck: false
5751
# - name: acm
5852
# apt_repo: --alt_repo--
5953
# apt_validate: false
60-
# - name: adm
61-
# apt_repo: --alt_repo--
62-
# apt_validate: false

molecule/all-nms-modules-set1/converge.yml

-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,4 @@
1818
key: license/nginx-repo.key
1919
nms_modules:
2020
- name: acm
21-
- name: adm
2221
- name: sm

molecule/all-nms-modules-set1/verify.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
- nms-ingestion
3939
- nms-integrations
4040
- nms-acm
41-
- nms-adm
4241

4342
- name: Verify NGINX Management Suite modules are loaded
4443
ansible.builtin.uri:
@@ -48,4 +47,4 @@
4847
return_content: true
4948
body_format: json
5049
register: response
51-
failed_when: '("API Connectivity Manager" and "App Delivery Manager" and "Security Monitoring") not in (response.json | map(attribute="name") | list)'
50+
failed_when: '("API Connectivity Manager" and "Security Monitoring") not in (response.json | map(attribute="name") | list)'

molecule/all-nms-modules-set2/converge.yml

-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,4 @@
1818
key: license/nginx-repo.key
1919
nms_modules:
2020
- name: acm
21-
- name: adm
2221
- name: sm

molecule/all-nms-modules-set2/verify.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
- nms-ingestion
3939
- nms-integrations
4040
- nms-acm
41-
- nms-adm
4241

4342
- name: Verify NGINX Management Suite modules are loaded
4443
ansible.builtin.uri:
@@ -48,4 +47,4 @@
4847
return_content: true
4948
body_format: json
5049
register: response
51-
failed_when: '("API Connectivity Manager" and "App Delivery Manager" and "Security Monitoring") not in (response.json | map(attribute="name") | list)'
50+
failed_when: '("API Connectivity Manager" and "Security Monitoring") not in (response.json | map(attribute="name") | list)'

vars/main.yml

-7
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ nms_services: [
6767

6868
nms_module_vars: [
6969
acm,
70-
adm,
7170
sm,
7271
]
7372

@@ -79,12 +78,6 @@ nms_module_vals:
7978
default_centos_yum_repo: ""
8079
default_amazon_yum_repo: ""
8180
default_deb_based_apt_repo: ""
82-
adm:
83-
package_name: nms-app-delivery-manager
84-
systemd_name: nms-adm
85-
default_centos_yum_repo: https://pkgs.nginx.com/adm/centos/$releasever/$basearch/
86-
default_amazon_yum_repo: https://pkgs.nginx.com/adm/amzn2/$releasever/$basearch/
87-
default_deb_based_apt_repo: deb [signed-by={{ nms_keyring_path | default(nms_default_keyring_path) }}] https://pkgs.nginx.com/adm/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} nginx-plus
8881
sm:
8982
package_name: nms-sm
9083
systemd_name: ""

0 commit comments

Comments
 (0)