openstack/openstack-ansible
Code Issues Proposed changes

SUSE: Remove lxc-1.X.X workarounds

Browse Source 
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
This commit is contained in:
Markos Chandras 2017-10-05 14:17:06 +01:00
parent 0739b9106a
commit a955c0b507
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
playbooks/common-tasks/os-lxc-container-setup.yml
View File

@ -91,16 +91,11 @@
# Due to https://github.com/ansible/ansible-modules-extras/issues/2691 # Due to https://github.com/ansible/ansible-modules-extras/issues/2691
# this uses the LXC CLI tools to ensure that we get logging. # this uses the LXC CLI tools to ensure that we get logging.
# TODO(odyssey4me): revisit this once the bug is fixed and released # 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 - name: Lxc container restart
command: > command: >
lxc-stop --name {{ inventory_hostname }} lxc-stop --name {{ inventory_hostname }}
--logfile {{ lxc_container_log_path }}/lxc-{{ inventory_hostname }}.log --logfile {{ lxc_container_log_path }}/lxc-{{ inventory_hostname }}.log
--logpriority {{ (debug | bool) | ternary('DEBUG', 'INFO') }} --logpriority {{ (debug | bool) | ternary('DEBUG', 'INFO') }}
"{{ (hostvars[physical_host]['ansible_pkg_mgr'] == 'zypper') | ternary('-t 10', '') }}"
delegate_to: "{{ physical_host }}" delegate_to: "{{ physical_host }}"
register: container_stop register: container_stop
until: container_stop | success until: container_stop | success