From b291961361c6f3a3921ca55f73cef36211876f1a Mon Sep 17 00:00:00 2001 From: git-harry Date: Thu, 27 Jul 2017 21:14:49 +0100 Subject: [PATCH] Fix neutron agent container removal This change fixes the removal of neutron agent containers so that it no longer relies on the containers existing on the deploy host. The file `leapfrog_remove_remaining_old_containers` is only created on the deploy host, when combined with the fact that the original task couldn't fail, it resulted in the removal of the containers silently failing on multi-node builds. This change gets the list of containers from the file on the deploy host before trying to delete them on all hosts. Change-Id: Ic95187fd7e7ff93c796ce01f296cb06a16ba72bd --- .../neutron-remove-old-containers.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/leap-upgrades/upgrade-utilities/neutron-remove-old-containers.yml b/leap-upgrades/upgrade-utilities/neutron-remove-old-containers.yml index e0fd1a37..4a0d7fe7 100644 --- a/leap-upgrades/upgrade-utilities/neutron-remove-old-containers.yml +++ b/leap-upgrades/upgrade-utilities/neutron-remove-old-containers.yml @@ -13,17 +13,22 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: Remove the reminent neutron agent containers +- name: Remove the remnant neutron agent containers hosts: "hosts" gather_facts: false user: root tasks: - - name: Search for old containers not yet deleted - shell: >- - while read line; do lxc-destroy -fn $line; done < /etc/openstack_deploy/leapfrog_remove_remaining_old_containers - failed_when: false - args: - executable: /bin/bash + - name: Get list of old containers + command: "cat /etc/openstack_deploy/leapfrog_remove_remaining_old_containers" + run_once: true + delegate_to: localhost + register: old_containers + + - name: Destroy old containers + command: "lxc-destroy -fn {{ item }}" + with_items: old_containers.stdout_lines + ignore_errors: true + # TODO: Improve l2 convergence too. - name: Remove the reminent neutron agent containers