From 7ae58056e9710ab888be507b927b70a4c43b00b7 Mon Sep 17 00:00:00 2001 From: pav Date: Mon, 23 Oct 2023 15:35:06 +0100 Subject: [PATCH 1/4] New server type to test ansible join ad role --- .../group_vars/server_type_hmpps_domain_services.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 ansible/group_vars/server_type_hmpps_domain_services.yml diff --git a/ansible/group_vars/server_type_hmpps_domain_services.yml b/ansible/group_vars/server_type_hmpps_domain_services.yml new file mode 100644 index 000000000..8279847a0 --- /dev/null +++ b/ansible/group_vars/server_type_hmpps_domain_services.yml @@ -0,0 +1,11 @@ +--- +ansible_python_interpreter: python3.9 + +server_type_roles_list: + - join-ad_linux + +collectd_monitored_services_servertype: + - metric_name: chronyd + shell_cmd: "systemctl is-active chronyd" + +roles_list: "{{ (ami_roles_list | default([]) | difference(server_type_roles_list | default([]))) + (server_type_roles_list | default([])) }}" \ No newline at end of file From 4cfa4b3b180fd66136d9e9b6b989e08d1a2cac1e Mon Sep 17 00:00:00 2001 From: pav Date: Mon, 23 Oct 2023 15:37:11 +0100 Subject: [PATCH 2/4] Typo --- ansible/group_vars/server_type_hmpps_domain_services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/server_type_hmpps_domain_services.yml b/ansible/group_vars/server_type_hmpps_domain_services.yml index 8279847a0..b0447d00a 100644 --- a/ansible/group_vars/server_type_hmpps_domain_services.yml +++ b/ansible/group_vars/server_type_hmpps_domain_services.yml @@ -2,7 +2,7 @@ ansible_python_interpreter: python3.9 server_type_roles_list: - - join-ad_linux + - join-ad-linux collectd_monitored_services_servertype: - metric_name: chronyd From 61dae75c996a3ce99ba10b7440897c9c78649fbf Mon Sep 17 00:00:00 2001 From: pav Date: Mon, 23 Oct 2023 15:42:20 +0100 Subject: [PATCH 3/4] Clean up --- ansible/group_vars/server_type_hmpps_domain_services.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ansible/group_vars/server_type_hmpps_domain_services.yml b/ansible/group_vars/server_type_hmpps_domain_services.yml index b0447d00a..db5f22f96 100644 --- a/ansible/group_vars/server_type_hmpps_domain_services.yml +++ b/ansible/group_vars/server_type_hmpps_domain_services.yml @@ -2,10 +2,4 @@ ansible_python_interpreter: python3.9 server_type_roles_list: - - join-ad-linux - -collectd_monitored_services_servertype: - - metric_name: chronyd - shell_cmd: "systemctl is-active chronyd" - -roles_list: "{{ (ami_roles_list | default([]) | difference(server_type_roles_list | default([]))) + (server_type_roles_list | default([])) }}" \ No newline at end of file + - join-ad-linux \ No newline at end of file From b91aea29bcacde55df5a2205b82dc29ddc32e156 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 23 Oct 2023 14:44:04 +0000 Subject: [PATCH 4/4] Commit changes made by code formatters --- ansible/group_vars/server_type_hmpps_domain_services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/server_type_hmpps_domain_services.yml b/ansible/group_vars/server_type_hmpps_domain_services.yml index db5f22f96..d331a0b1b 100644 --- a/ansible/group_vars/server_type_hmpps_domain_services.yml +++ b/ansible/group_vars/server_type_hmpps_domain_services.yml @@ -2,4 +2,4 @@ ansible_python_interpreter: python3.9 server_type_roles_list: - - join-ad-linux \ No newline at end of file + - join-ad-linux