Skip to content

Commit 040b13b

Browse files
npawelekKevin Carter
authored and
Kevin Carter
committed
Remove all agent restart handlers (#396)
* Remove all the handler things * Remove restart from hardware vendor common tasks * Remove poller and rsyslogd handlers * Force maas-restart.yml to always restart all hosts
1 parent b157e76 commit 040b13b

34 files changed

+15
-480
lines changed

playbooks/common-tasks/maas-host-vendor-dell.yml

-6
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
owner: "root"
2121
group: "root"
2222
mode: "0644"
23-
notify:
24-
- Restart rax-maas
2523
tags:
2624
- maas-hosts-vendor-dell
2725

@@ -32,8 +30,6 @@
3230
owner: "root"
3331
group: "root"
3432
mode: "0644"
35-
notify:
36-
- Restart rax-maas
3733
tags:
3834
- maas-hosts-vendor-dell
3935

@@ -44,7 +40,5 @@
4440
owner: "root"
4541
group: "root"
4642
mode: "0644"
47-
notify:
48-
- Restart rax-maas
4943
tags:
5044
- maas-hosts-vendor-dell

playbooks/common-tasks/maas-host-vendor-hp.yml

-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
owner: "root"
2121
group: "root"
2222
mode: "0644"
23-
notify:
24-
- Restart rax-maas
2523
tags:
2624
- maas-hosts-vendor-hp
2725

@@ -33,7 +31,5 @@
3331
- "hp-memory"
3432
- "hp-processors"
3533
- "hp-vdisk"
36-
notify:
37-
- Restart rax-maas
3834
tags:
3935
- maas-hosts-vendor-hp

playbooks/handlers/main.yml

-20
This file was deleted.

playbooks/maas-agent-install.yml

-4
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,3 @@
134134
- vars/maas-{{ ansible_distribution | lower }}.yml
135135
tags:
136136
- maas-agent-install
137-
138-
# NOTE(cloudnull): When we get to ONLY using Ansible 2.2+ this playbook can be removed as the handler
139-
# will be globally unified.
140-
- include: maas-restart.yml

playbooks/maas-agent-setup.yml

-10
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@
5353
times: yes
5454
rsync_opts:
5555
- "--no-motd"
56-
notify:
57-
- Restart rax-maas
5856

5957
- name: Drop in wrapper script to run maas plugins in venv
6058
template:
@@ -103,8 +101,6 @@
103101
mode: 0600
104102
owner: root
105103
group: root
106-
notify:
107-
- Restart rax-maas
108104
when:
109105
- maas_use_api | bool
110106

@@ -116,15 +112,9 @@
116112
when:
117113
- maas_use_api | bool
118114

119-
handlers:
120-
- include: handlers/main.yml
121115
vars_files:
122116
- vars/main.yml
123117
- vars/maas-auth.yml
124118
- vars/maas-agent.yml
125119
tags:
126120
- maas-agent-setup
127-
128-
# NOTE(cloudnull): When we get to ONLY using Ansible 2.2+ this playbook can be removed as the handler
129-
# will be globally unified.
130-
- include: maas-restart.yml

playbooks/maas-ceph-mon.yml

-9
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
- name: Set the current group
2222
set_fact:
2323
maas_current_group: mons
24-
2524
tags:
2625
- maas-ceph-mons
2726

@@ -56,16 +55,8 @@
5655
with_items:
5756
- ceph_mon_stats
5857
- ceph_cluster_stats
59-
notify:
60-
- Restart rax-maas
6158

62-
handlers:
63-
- include: handlers/main.yml
6459
vars_files:
6560
- vars/main.yml
6661
tags:
6762
- maas-ceph-mons
68-
69-
# NOTE(cloudnull): When we get to ONLY using Ansible 2.2+ this playbook can be removed as the handler
70-
# will be globally unified.
71-
- include: maas-restart.yml

playbooks/maas-ceph-osd.yml

-8
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,8 @@
5959
group: "root"
6060
mode: "0644"
6161
delegate_to: "{{ physical_host | default(ansible_host) }}"
62-
notify:
63-
- Restart rax-maas
6462

65-
handlers:
66-
- include: handlers/main.yml
6763
vars_files:
6864
- vars/main.yml
6965
tags:
7066
- maas-ceph-osds
71-
72-
# NOTE(cloudnull): When we get to ONLY using Ansible 2.2+ this playbook can be removed as the handler
73-
# will be globally unified.
74-
- include: maas-restart.yml

playbooks/maas-ceph-rgw.yml

-9
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
- name: Set the current group
2222
set_fact:
2323
maas_current_group: rgws
24-
2524
tags:
2625
- maas-ceph-rgws
2726

@@ -55,16 +54,8 @@
5554
delegate_to: "{{ physical_host | default(ansible_host) }}"
5655
with_items:
5756
- ceph_rgw_stats
58-
notify:
59-
- Restart rax-maas
6057

61-
handlers:
62-
- include: handlers/main.yml
6358
vars_files:
6459
- vars/main.yml
6560
tags:
6661
- maas-ceph-rgws
67-
68-
# NOTE(cloudnull): When we get to ONLY using Ansible 2.2+ this playbook can be removed as the handler
69-
# will be globally unified.
70-
- include: maas-restart.yml

playbooks/maas-container-storage.yml

-9
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,9 @@
8888
when:
8989
- ansible_distribution_version == '14.04'
9090
delegate_to: "{{ physical_host | default(ansible_host) }}"
91-
notify:
92-
- Restart rax-maas
93-
94-
handlers:
95-
- include: handlers/main.yml
9691

9792
vars_files:
9893
- vars/main.yml
9994
- vars/maas-container.yml
10095
tags:
10196
- maas-container-storage
102-
103-
# NOTE(cloudnull): When we get to ONLY using Ansible 2.2+ this playbook can be removed as the handler
104-
# will be globally unified.
105-
- include: maas-restart.yml

playbooks/maas-host-cdm.yml

-16
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
- name: Set the current group
2222
set_fact:
2323
maas_current_group: hosts
24-
2524
tags:
2625
- maas-host-cdm
2726

@@ -38,8 +37,6 @@
3837
mode: "0644"
3938
with_items:
4039
- "{{ maas_filesystem_overrides | default(maas_filesystem_monitors) }}"
41-
notify:
42-
- Restart rax-maas
4340

4441
- name: Install disk utilisation Checks
4542
template:
@@ -48,8 +45,6 @@
4845
owner: "root"
4946
group: "root"
5047
mode: "0644"
51-
notify:
52-
- Restart rax-maas
5348

5449
- name: Install memory Checks
5550
template:
@@ -58,8 +53,6 @@
5853
owner: "root"
5954
group: "root"
6055
mode: "0644"
61-
notify:
62-
- Restart rax-maas
6356

6457
- name: Install cpu Checks
6558
template:
@@ -68,18 +61,9 @@
6861
owner: "root"
6962
group: "root"
7063
mode: "0644"
71-
notify:
72-
- Restart rax-maas
73-
7464

75-
handlers:
76-
- include: handlers/main.yml
7765
vars_files:
7866
- vars/main.yml
7967
- vars/maas-host.yml
8068
tags:
8169
- maas-ceph-osds
82-
83-
# NOTE(cloudnull): When we get to ONLY using Ansible 2.2+ this playbook can be removed as the handler
84-
# will be globally unified.
85-
- include: maas-restart.yml

playbooks/maas-host-kernel.yml

-9
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
- name: Set the current group
2222
set_fact:
2323
maas_current_group: hosts
24-
2524
tags:
2625
- maas-hosts-kernel
2726

@@ -36,17 +35,9 @@
3635
owner: "root"
3736
group: "root"
3837
mode: "0644"
39-
notify:
40-
- Restart rax-maas
4138

42-
handlers:
43-
- include: handlers/main.yml
4439
vars_files:
4540
- vars/main.yml
4641
- vars/maas-host.yml
4742
tags:
4843
- maas-hosts-kernel
49-
50-
# NOTE(cloudnull): When we get to ONLY using Ansible 2.2+ this playbook can be removed as the handler
51-
# will be globally unified.
52-
- include: maas-restart.yml

playbooks/maas-host-network.yml

-11
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
- name: Set the current group
2222
set_fact:
2323
maas_current_group: hosts
24-
2524
tags:
2625
- maas-hosts-network
2726

@@ -47,8 +46,6 @@
4746
mode: "0644"
4847
with_together:
4948
- "{{ maas_network_checks_list }}"
50-
notify:
51-
- Restart rax-maas
5249

5350
- name: Install conntrack count checks
5451
template:
@@ -57,17 +54,9 @@
5754
owner: "root"
5855
group: "root"
5956
mode: "0644"
60-
notify:
61-
- Restart rax-maas
6257

63-
handlers:
64-
- include: handlers/main.yml
6558
vars_files:
6659
- vars/main.yml
6760
- vars/maas-host.yml
6861
tags:
6962
- maas-hosts-network
70-
71-
# NOTE(cloudnull): When we get to ONLY using Ansible 2.2+ this playbook can be removed as the handler
72-
# will be globally unified.
73-
- include: maas-restart.yml

playbooks/maas-host-private-checks.yml

-6
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,9 @@
4242
with_items:
4343
- { name: "private_ping_check" }
4444
- { name: "private_ssh_check" }
45-
notify:
46-
- Restart rax-maas
4745

48-
handlers:
49-
- include: handlers/main.yml
5046
vars_files:
5147
- vars/main.yml
5248
- vars/maas-poller.yml
5349
tags:
5450
- maas-poller-setup
55-
56-
- include: maas-restart.yml

playbooks/maas-host-vendor.yml

-6
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,7 @@
3535
- maas_host_check | bool
3636
- ansible_system_vendor.split()[0] | lower == 'dell'
3737

38-
handlers:
39-
- include: handlers/main.yml
4038
vars_files:
4139
- vars/main.yml
4240
tags:
4341
- maas-hosts-vendor
44-
45-
# NOTE(cloudnull): When we get to ONLY using Ansible 2.2+ this playbook can be removed as the handler
46-
# will be globally unified.
47-
- include: maas-restart.yml

playbooks/maas-infra-elasticsearch.yml

-9
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
- name: Set the current group
2222
set_fact:
2323
maas_current_group: elasticsearch_all
24-
2524
tags:
2625
- maas-infra-elasticsearch
2726

@@ -37,17 +36,9 @@
3736
group: "root"
3837
mode: "0644"
3938
delegate_to: "{{ physical_host | default(ansible_host) }}"
40-
notify:
41-
- Restart rax-maas
4239

43-
handlers:
44-
- include: handlers/main.yml
4540
vars_files:
4641
- vars/main.yml
4742
- vars/maas-infra.yml
4843
tags:
4944
- maas-infra-elasticsearch
50-
51-
# NOTE(cloudnull): When we get to ONLY using Ansible 2.2+ this playbook can be removed as the handler
52-
# will be globally unified.
53-
- include: maas-restart.yml

playbooks/maas-infra-filebeat.yml

-9
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
- name: Set the current group
2222
set_fact:
2323
maas_current_group: hosts
24-
2524
tags:
2625
- maas-infra-filebeat
2726

@@ -40,17 +39,9 @@
4039
when:
4140
- "'elasticsearch_all' in groups"
4241
- groups['elasticsearch_all'] | length > 0
43-
notify:
44-
- Restart rax-maas
4542

46-
handlers:
47-
- include: handlers/main.yml
4843
vars_files:
4944
- vars/main.yml
5045
- vars/maas-infra.yml
5146
tags:
5247
- maas-infra-filebeat
53-
54-
# NOTE(cloudnull): When we get to ONLY using Ansible 2.2+ this playbook can be removed as the handler
55-
# will be globally unified.
56-
- include: maas-restart.yml

0 commit comments

Comments
 (0)