From a955c0b5070d06933af1fe679390ab4b04662032 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 5 Oct 2017 14:17:06 +0100 Subject: [PATCH] SUSE: Remove lxc-1.X.X workarounds openSUSE is now using lxc-2.X.X from the OBS repository in the lxc_hosts role so there is no need to have the lxc-1.X.X workarounds anymore. Change-Id: I5a1de489df2dff21c262ec5bcea709d1c719a6af --- playbooks/common-tasks/os-lxc-container-setup.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/playbooks/common-tasks/os-lxc-container-setup.yml b/playbooks/common-tasks/os-lxc-container-setup.yml index e776f3ed30..e85416ce26 100644 --- a/playbooks/common-tasks/os-lxc-container-setup.yml +++ b/playbooks/common-tasks/os-lxc-container-setup.yml @@ -91,16 +91,11 @@ # Due to https://github.com/ansible/ansible-modules-extras/issues/2691 # this uses the LXC CLI tools to ensure that we get logging. # TODO(odyssey4me): revisit this once the bug is fixed and released -# NOTE(hwoarang): We pass the timeout (-t) option on openSUSE due to -# https://bugzilla.opensuse.org/show_bug.cgi?id=1054609. Feel free to -# remove this workaround when the bug is closed or lxc-2.X.X becomes the -# default on openSUSE. - name: Lxc container restart command: > lxc-stop --name {{ inventory_hostname }} --logfile {{ lxc_container_log_path }}/lxc-{{ inventory_hostname }}.log --logpriority {{ (debug | bool) | ternary('DEBUG', 'INFO') }} - "{{ (hostvars[physical_host]['ansible_pkg_mgr'] == 'zypper') | ternary('-t 10', '') }}" delegate_to: "{{ physical_host }}" register: container_stop until: container_stop | success