diff --git a/roles/container-engine/containerd/tasks/main.yml b/roles/container-engine/containerd/tasks/main.yml index 45caa5344c3..8eb1347a8af 100644 --- a/roles/container-engine/containerd/tasks/main.yml +++ b/roles/container-engine/containerd/tasks/main.yml @@ -39,7 +39,7 @@ remote_src: yes extra_opts: - --strip-components=1 - notify: restart containerd + notify: Restart containerd - name: Containerd | Remove orphaned binary file: @@ -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: @@ -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 @@ -101,7 +101,7 @@ owner: "root" mode: 0644 with_dict: "{{ containerd_base_runtime_specs | default({}) }}" - notify: restart containerd + notify: Restart containerd - name: Containerd | Copy containerd config file template: @@ -109,7 +109,7 @@ dest: "{{ containerd_cfg_dir }}/config.toml" owner: "root" mode: 0640 - notify: restart containerd + notify: Restart containerd - name: Containerd | Configure containerd registries block: diff --git a/roles/container-engine/cri-dockerd/handlers/main.yml b/roles/container-engine/cri-dockerd/handlers/main.yml index 5f926b635d8..3990d3397c7 100644 --- a/roles/container-engine/cri-dockerd/handlers/main.yml +++ b/roles/container-engine/cri-dockerd/handlers/main.yml @@ -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: diff --git a/roles/container-engine/cri-dockerd/tasks/main.yml b/roles/container-engine/cri-dockerd/tasks/main.yml index 70da654df81..f8965fd041e 100644 --- a/roles/container-engine/cri-dockerd/tasks/main.yml +++ b/roles/container-engine/cri-dockerd/tasks/main.yml @@ -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: @@ -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 diff --git a/roles/container-engine/cri-o/tasks/main.yaml b/roles/container-engine/cri-o/tasks/main.yaml index e2811bebb76..6b3411acaf5 100644 --- a/roles/container-engine/cri-o/tasks/main.yaml +++ b/roles/container-engine/cri-o/tasks/main.yaml @@ -80,7 +80,7 @@ remote_src: true with_items: - "{{ crio_bin_files }}" - notify: restart crio + notify: Restart crio - name: Cri-o | copy service file copy: @@ -88,14 +88,14 @@ 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: @@ -103,7 +103,7 @@ dest: /etc/containers/policy.json mode: 0755 remote_src: true - notify: restart crio + notify: Restart crio - name: Cri-o | copy mounts.conf copy: @@ -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: @@ -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 diff --git a/roles/container-engine/docker/tasks/main.yml b/roles/container-engine/docker/tasks/main.yml index 88ec2157040..c7ecc1f7bc9 100644 --- a/roles/container-engine/docker/tasks/main.yml +++ b/roles/container-engine/docker/tasks/main.yml @@ -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 @@ -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 diff --git a/roles/container-engine/docker/tasks/systemd.yml b/roles/container-engine/docker/tasks/systemd.yml index a5f8c1d8236..995b02fad89 100644 --- a/roles/container-engine/docker/tasks/systemd.yml +++ b/roles/container-engine/docker/tasks/systemd.yml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/roles/etcd/handlers/main.yml b/roles/etcd/handlers/main.yml index 7c0243b9394..f09789c25f0 100644 --- a/roles/etcd/handlers/main.yml +++ b/roles/etcd/handlers/main.yml @@ -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 diff --git a/roles/etcd/tasks/gen_certs_script.yml b/roles/etcd/tasks/gen_certs_script.yml index 66cd25cffd6..8a84c44308d 100644 --- a/roles/etcd/tasks/gen_certs_script.yml +++ b/roles/etcd/tasks/gen_certs_script.yml @@ -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 }}" @@ -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: @@ -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: @@ -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: diff --git a/roles/etcd/tasks/install_docker.yml b/roles/etcd/tasks/install_docker.yml index e81d7feac31..a661f3fb471 100644 --- a/roles/etcd/tasks/install_docker.yml +++ b/roles/etcd/tasks/install_docker.yml @@ -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('') diff --git a/roles/etcd/tasks/install_host.yml b/roles/etcd/tasks/install_host.yml index 5db79cddae6..0a20451251c 100644 --- a/roles/etcd/tasks/install_host.yml +++ b/roles/etcd/tasks/install_host.yml @@ -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('') diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml index 2766833563d..2d17103dbca 100644 --- a/roles/etcd/tasks/main.yml +++ b/roles/etcd/tasks/main.yml @@ -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 diff --git a/roles/etcd/tasks/refresh_config.yml b/roles/etcd/tasks/refresh_config.yml index 57010fee15a..d5e0045325c 100644 --- a/roles/etcd/tasks/refresh_config.yml +++ b/roles/etcd/tasks/refresh_config.yml @@ -4,7 +4,7 @@ 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 @@ -12,5 +12,5 @@ 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 diff --git a/roles/network_plugin/calico/handlers/main.yml b/roles/network_plugin/calico/handlers/main.yml index 9aa8c3e97dc..7f998dba382 100644 --- a/roles/network_plugin/calico/handlers/main.yml +++ b/roles/network_plugin/calico/handlers/main.yml @@ -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 diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml index d25c97f3349..df17653d512 100644 --- a/roles/network_plugin/calico/tasks/install.yml +++ b/roles/network_plugin/calico/tasks/install.yml @@ -23,7 +23,7 @@ mode: 0644 owner: root register: calico_conflist - notify: reset_calico_cni + notify: Reset_calico_cni - name: Calico | Create calico certs directory file: diff --git a/roles/network_plugin/kube-router/tasks/main.yml b/roles/network_plugin/kube-router/tasks/main.yml index 945de79f112..27975c374b3 100644 --- a/roles/network_plugin/kube-router/tasks/main.yml +++ b/roles/network_plugin/kube-router/tasks/main.yml @@ -18,7 +18,7 @@ mode: 0644 owner: "{{ kube_owner }}" notify: - - reset_kube_router + - Reset_kube_router - name: Kube-router | Slurp cni config slurp: @@ -46,7 +46,7 @@ mode: 0644 owner: "{{ kube_owner }}" notify: - - reset_kube_router + - Reset_kube_router - name: Kube-router | Delete old configuration file: