Skip to content

Commit

Permalink
project: update notify after name capitalization
Browse files Browse the repository at this point in the history
Signed-off-by: Arthur Outhenin-Chalandre <[email protected]>
  • Loading branch information
MrFreezeex committed Jun 30, 2023
1 parent 83f4755 commit 2cf7b9d
Show file tree
Hide file tree
Showing 14 changed files with 48 additions and 48 deletions.
10 changes: 5 additions & 5 deletions roles/container-engine/containerd/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
remote_src: yes
extra_opts:
- --strip-components=1
notify: restart containerd
notify: Restart containerd

- name: Containerd | Remove orphaned binary
file:
Expand All @@ -61,7 +61,7 @@
src: containerd.service.j2
dest: /etc/systemd/system/containerd.service
mode: 0644
notify: restart containerd
notify: Restart containerd

- name: Containerd | Ensure containerd directories exist
file:
Expand All @@ -81,7 +81,7 @@
src: http-proxy.conf.j2
dest: "{{ containerd_systemd_dir }}/http-proxy.conf"
mode: 0644
notify: restart containerd
notify: Restart containerd
when: http_proxy is defined or https_proxy is defined

- name: Containerd | Generate default base_runtime_spec
Expand All @@ -101,15 +101,15 @@
owner: "root"
mode: 0644
with_dict: "{{ containerd_base_runtime_specs | default({}) }}"
notify: restart containerd
notify: Restart containerd

- name: Containerd | Copy containerd config file
template:
src: config.toml.j2
dest: "{{ containerd_cfg_dir }}/config.toml"
owner: "root"
mode: 0640
notify: restart containerd
notify: Restart containerd

- name: Containerd | Configure containerd registries
block:
Expand Down
10 changes: 5 additions & 5 deletions roles/container-engine/cri-dockerd/handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
- name: Restart and enable cri-dockerd
command: /bin/true
notify:
- cri-dockerd | reload systemd
- cri-dockerd | restart docker.service
- cri-dockerd | reload cri-dockerd.socket
- cri-dockerd | reload cri-dockerd.service
- cri-dockerd | enable cri-dockerd service
- Cri-dockerd | reload systemd
- Cri-dockerd | restart docker.service
- Cri-dockerd | reload cri-dockerd.socket
- Cri-dockerd | reload cri-dockerd.service
- Cri-dockerd | enable cri-dockerd service

- name: Cri-dockerd | reload systemd
systemd:
Expand Down
4 changes: 2 additions & 2 deletions roles/container-engine/cri-dockerd/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
mode: 0755
remote_src: true
notify:
- restart and enable cri-dockerd
- Restart and enable cri-dockerd

- name: Generate cri-dockerd systemd unit files
template:
Expand All @@ -22,7 +22,7 @@
- cri-dockerd.service
- cri-dockerd.socket
notify:
- restart and enable cri-dockerd
- Restart and enable cri-dockerd

- name: Flush handlers
meta: flush_handlers
16 changes: 8 additions & 8 deletions roles/container-engine/cri-o/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,30 +80,30 @@
remote_src: true
with_items:
- "{{ crio_bin_files }}"
notify: restart crio
notify: Restart crio

- name: Cri-o | copy service file
copy:
src: "{{ local_release_dir }}/cri-o/contrib/crio.service"
dest: /etc/systemd/system/crio.service
mode: 0755
remote_src: true
notify: restart crio
notify: Restart crio

- name: Cri-o | update the bin dir for crio.service file
replace:
dest: /etc/systemd/system/crio.service
regexp: "/usr/local/bin/crio"
replace: "{{ bin_dir }}/crio"
notify: restart crio
notify: Restart crio

- name: Cri-o | copy default policy
copy:
src: "{{ local_release_dir }}/cri-o/contrib/policy.json"
dest: /etc/containers/policy.json
mode: 0755
remote_src: true
notify: restart crio
notify: Restart crio

- name: Cri-o | copy mounts.conf
copy:
Expand All @@ -112,7 +112,7 @@
mode: 0644
when:
- ansible_os_family == 'RedHat'
notify: restart crio
notify: Restart crio

- name: Cri-o | create directory for oci hooks
file:
Expand Down Expand Up @@ -156,21 +156,21 @@
dest: "/etc/containers/registries.conf.d/10-{{ item.prefix | default(item.location) | regex_replace(':', '_') }}.conf"
mode: 0644
loop: "{{ crio_registries }}"
notify: restart crio
notify: Restart crio

- name: Cri-o | configure unqualified registry settings
template:
src: unqualified.conf.j2
dest: "/etc/containers/registries.conf.d/01-unqualified.conf"
mode: 0644
notify: restart crio
notify: Restart crio

- name: Cri-o | write cri-o proxy drop-in
template:
src: http-proxy.conf.j2
dest: /etc/systemd/system/crio.service.d/http-proxy.conf
mode: 0644
notify: restart crio
notify: Restart crio
when: http_proxy is defined or https_proxy is defined

- name: Cri-o | configure the uid/gid space for user namespaces
Expand Down
4 changes: 2 additions & 2 deletions roles/container-engine/docker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
until: docker_task_result is succeeded
retries: 4
delay: "{{ retry_stagger | d(3) }}"
notify: restart docker
notify: Restart docker
when:
- not ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]
- not is_ostree
Expand Down Expand Up @@ -156,7 +156,7 @@
- /etc/systemd/system/docker.service.d/docker-options.conf
- /etc/systemd/system/docker.service.d/docker-dns.conf
- /etc/systemd/system/docker.service.d/docker-orphan-cleanup.conf
notify: restart docker
notify: Restart docker

- name: Flush handlers so we can wait for docker to come up
meta: flush_handlers
Expand Down
10 changes: 5 additions & 5 deletions roles/container-engine/docker/tasks/systemd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
src: http-proxy.conf.j2
dest: /etc/systemd/system/docker.service.d/http-proxy.conf
mode: 0644
notify: restart docker
notify: Restart docker
when: http_proxy is defined or https_proxy is defined

- name: Get systemd version
Expand All @@ -29,7 +29,7 @@
dest: /etc/systemd/system/docker.service
mode: 0644
register: docker_service_file
notify: restart docker
notify: Restart docker
when:
- not ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]
- not is_fedora_coreos
Expand All @@ -39,14 +39,14 @@
src: docker-options.conf.j2
dest: "/etc/systemd/system/docker.service.d/docker-options.conf"
mode: 0644
notify: restart docker
notify: Restart docker

- name: Write docker dns systemd drop-in
template:
src: docker-dns.conf.j2
dest: "/etc/systemd/system/docker.service.d/docker-dns.conf"
mode: 0644
notify: restart docker
notify: Restart docker
when: dns_mode != 'none' and resolvconf_mode == 'docker_dns'

- name: Copy docker orphan clean up script to the node
Expand All @@ -61,7 +61,7 @@
src: docker-orphan-cleanup.conf.j2
dest: "/etc/systemd/system/docker.service.d/docker-orphan-cleanup.conf"
mode: 0644
notify: restart docker
notify: Restart docker
when: docker_orphan_clean_up | bool

- name: Flush handlers
Expand Down
12 changes: 6 additions & 6 deletions roles/etcd/handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
command: /bin/true
notify:
- Backup etcd data
- etcd | reload systemd
- reload etcd
- wait for etcd up
- Etcd | reload systemd
- Reload etcd
- Wait for etcd up
- Cleanup etcd backups

- name: Restart etcd-events
command: /bin/true
notify:
- etcd | reload systemd
- reload etcd-events
- wait for etcd-events up
- Etcd | reload systemd
- Reload etcd-events
- Wait for etcd-events up

- name: Backup etcd
import_tasks: backup.yml
Expand Down
8 changes: 4 additions & 4 deletions roles/etcd/tasks/gen_certs_script.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
run_once: yes
delegate_to: "{{ groups['etcd'][0] }}"
when: gen_certs|default(false)
notify: set etcd_secret_changed
notify: Set etcd_secret_changed

- name: Gen_certs | run cert generation script for all clients
command: "bash -x {{ etcd_script_dir }}/make-ssl-etcd.sh -f {{ etcd_config_dir }}/openssl.conf -d {{ etcd_cert_dir }}"
Expand All @@ -73,7 +73,7 @@
- kube_network_plugin in ["calico", "flannel", "cilium"] or cilium_deploy_additionally | default(false) | bool
- kube_network_plugin != "calico" or calico_datastore == "etcd"
- gen_certs|default(false)
notify: set etcd_secret_changed
notify: Set etcd_secret_changed

- name: Gen_certs | Gather etcd member/admin and kube_control_plane client certs from first etcd node
slurp:
Expand All @@ -97,7 +97,7 @@
- inventory_hostname in groups['etcd']
- sync_certs|default(false)
- inventory_hostname != groups['etcd'][0]
notify: set etcd_secret_changed
notify: Set etcd_secret_changed

- name: Gen_certs | Write etcd member/admin and kube_control_plane client certs to other etcd nodes
copy:
Expand Down Expand Up @@ -129,7 +129,7 @@
- inventory_hostname != groups['etcd'][0]
- kube_network_plugin in ["calico", "flannel", "cilium"] or cilium_deploy_additionally | default(false) | bool
- kube_network_plugin != "calico" or calico_datastore == "etcd"
notify: set etcd_secret_changed
notify: Set etcd_secret_changed

- name: Gen_certs | Write node certs to other etcd nodes
copy:
Expand Down
4 changes: 2 additions & 2 deletions roles/etcd/tasks/install_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@

- name: Restart etcd if necessary
command: /bin/true
notify: restart etcd
notify: Restart etcd
when:
- etcd_cluster_setup
- etcd_image_tag not in etcd_current_docker_image.stdout|default('')

- name: Restart etcd-events if necessary
command: /bin/true
notify: restart etcd-events
notify: Restart etcd-events
when:
- etcd_events_cluster_setup
- etcd_image_tag not in etcd_events_current_docker_image.stdout|default('')
Expand Down
4 changes: 2 additions & 2 deletions roles/etcd/tasks/install_host.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

- name: Restart etcd if necessary
command: /bin/true
notify: restart etcd
notify: Restart etcd
when:
- etcd_cluster_setup
- etcd_version.lstrip('v') not in etcd_current_host_version.stdout|default('')

- name: Restart etcd-events if necessary
command: /bin/true
notify: restart etcd-events
notify: Restart etcd-events
when:
- etcd_events_cluster_setup
- etcd_version.lstrip('v') not in etcd_current_host_version.stdout|default('')
Expand Down
4 changes: 2 additions & 2 deletions roles/etcd/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@

- name: Restart etcd if certs changed
command: /bin/true
notify: restart etcd
notify: Restart etcd
when: is_etcd_master and etcd_cluster_setup and etcd_secret_changed|default(false)

- name: Restart etcd-events if certs changed
command: /bin/true
notify: restart etcd
notify: Restart etcd
when: is_etcd_master and etcd_events_cluster_setup and etcd_secret_changed|default(false)

# After etcd cluster is assembled, make sure that
Expand Down
4 changes: 2 additions & 2 deletions roles/etcd/tasks/refresh_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
src: etcd.env.j2
dest: /etc/etcd.env
mode: 0640
notify: restart etcd
notify: Restart etcd
when: is_etcd_master and etcd_cluster_setup

- name: Refresh config | Create etcd-events config file
template:
src: etcd-events.env.j2
dest: /etc/etcd-events.env
mode: 0640
notify: restart etcd-events
notify: Restart etcd-events
when: is_etcd_master and etcd_events_cluster_setup
2 changes: 1 addition & 1 deletion roles/network_plugin/calico/handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
command: /bin/true
when: calico_cni_config is defined
notify:
- delete 10-calico.conflist
- Delete 10-calico.conflist
- Calico | delete calico-node docker containers
- Calico | delete calico-node crio/containerd containers

Expand Down
4 changes: 2 additions & 2 deletions roles/network_plugin/kube-router/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
mode: 0644
owner: "{{ kube_owner }}"
notify:
- reset_kube_router
- Reset_kube_router

- name: Kube-router | Slurp cni config
slurp:
Expand Down Expand Up @@ -46,7 +46,7 @@
mode: 0644
owner: "{{ kube_owner }}"
notify:
- reset_kube_router
- Reset_kube_router

- name: Kube-router | Delete old configuration
file:
Expand Down

0 comments on commit 2cf7b9d

Please sign in to comment.