From 06123b795da5da1cf38d8ba8f86f2b8f3b25f570 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 2 Feb 2022 12:11:44 +0000 Subject: [PATCH] ntp: Remove removal of chrony container The chrony container removal was performed in the Xena cycle, so we no longer require this task in the 'overcloud host configure' command. Change-Id: I86fcc75e844eb922f62c90c45a105519845cc1a7 --- ansible/roles/ntp/tasks/prepare.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/ansible/roles/ntp/tasks/prepare.yml b/ansible/roles/ntp/tasks/prepare.yml index cf4d82a74..1c3e17c4c 100644 --- a/ansible/roles/ntp/tasks/prepare.yml +++ b/ansible/roles/ntp/tasks/prepare.yml @@ -17,23 +17,3 @@ state: "{{ 'stopped' if service_exists else omit }}" become: true with_items: "{{ ntp_service_disable_list }}" - -- name: Remove kolla-ansible installed chrony container - shell: - cmd: > - if [[ -n $(docker ps -aq -f name=chrony) ]]; then - docker rm -f -v chrony - fi - executable: "/bin/bash" - register: result - changed_when: result.stdout != "" - become: true - # NOTE(wszumski): There is an ordering issue where on a fresh host, docker - # will not have been configured, but if that is the case, the chrony container - # can't possibly exist, but trying to execute this unconditionally will fail - # with: No module named 'docker' as we have not yet added the docker package - # to the kayobe target venv, so we use 'docker rm' command with force and - # don't fail on error. - when: - - "'docker.service' in ansible_facts.services" - - ansible_facts.services['docker.service'].status == 'running'