From 6921aafb2b90a487b4491ece9189f90fe11bd201 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Wed, 10 Jun 2020 10:32:53 -0400 Subject: [PATCH] debian/uca: remove the handler notification The "update apt cache" in the ceph-handler role was never called and the handler trigger after adding the uca repository doesn't exist at all. Instead of using a handler for that we can just set the update_cache parameter to true like the other apt_repository tasks. Resolve merge conflict from cherry-picking this commit. Signed-off-by: Dimitri Savineau (cherry picked from commit 09d6706697d37abc245f627847c07e9b165d03a0) --- roles/ceph-common/tasks/installs/debian_uca_repository.yml | 3 +-- roles/ceph-handler/handlers/main.yml | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/roles/ceph-common/tasks/installs/debian_uca_repository.yml b/roles/ceph-common/tasks/installs/debian_uca_repository.yml index 92ff0c6d4..7861cfd2d 100644 --- a/roles/ceph-common/tasks/installs/debian_uca_repository.yml +++ b/roles/ceph-common/tasks/installs/debian_uca_repository.yml @@ -9,5 +9,4 @@ apt_repository: repo: "deb {{ ceph_stable_repo_uca }} {{ ceph_stable_release_uca }} main" state: present - update_cache: no - notify: update apt cache if a repo was added \ No newline at end of file + update_cache: yes diff --git a/roles/ceph-handler/handlers/main.yml b/roles/ceph-handler/handlers/main.yml index 2d85d1fbf..4af2f35ba 100644 --- a/roles/ceph-handler/handlers/main.yml +++ b/roles/ceph-handler/handlers/main.yml @@ -4,13 +4,6 @@ - not rolling_update | bool - not docker2podman | default(False) | bool block: - - name: update apt cache - apt: - update-cache: yes - when: ansible_os_family == 'Debian' - register: result - until: result is succeeded - - name: mons handler include_tasks: handler_mons.yml when: mon_group_name in group_names -- 2.39.5