diff --git a/tasks/lxc_install_yum.yml b/tasks/lxc_install_yum.yml index 701cd7b5..f214614d 100644 --- a/tasks/lxc_install_yum.yml +++ b/tasks/lxc_install_yum.yml @@ -86,16 +86,6 @@ tags: - lxc-packages -- name: Install distro SELinux packages asynchronously - package: - pkg: "{{ lxc_hosts_distro_selinux_packages }}" - state: "{{ lxc_hosts_package_state }}" - register: install_selinux_packages - async: 600 - poll: 0 - tags: - - lxc-packages - - name: Remove sub system lock if found file: path: "/var/lock/subsys/lxc" diff --git a/tasks/lxc_selinux.yml b/tasks/lxc_selinux.yml index 9d4a5ac3..08955f3c 100644 --- a/tasks/lxc_selinux.yml +++ b/tasks/lxc_selinux.yml @@ -13,16 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: Ensure SELinux distro packages have finished installing - async_status: - jid: "{{ install_selinux_packages.ansible_job_id }}" - register: _install_selinux_packages - until: _install_selinux_packages.finished - retries: 30 - when: - - install_selinux_packages is defined - - not install_selinux_packages | skipped - - name: Create directory for compiling SELinux policy file: path: "/tmp/lxc-attach-selinux/" diff --git a/vars/redhat-7-host.yml b/vars/redhat-7-host.yml index bb6c74c4..01dfc1b0 100644 --- a/vars/redhat-7-host.yml +++ b/vars/redhat-7-host.yml @@ -26,24 +26,18 @@ lxc_hosts_distro_packages: - dnsmasq - git - libseccomp + - libselinux + - libselinux-devel - lxc - lxc-devel - lxc-libs - lxc-templates + - policycoreutils-python - python2-lxc + - selinux-policy-devel - unzip - xz -# NOTE(mhayden): This packages are required for building the SELinux policy -# for LXC on CentOS 7. They're separate from the main package list because -# they take a signficant of time to install and they can be installed while -# other tasks run. -lxc_hosts_distro_selinux_packages: - - libselinux - - libselinux-devel - - policycoreutils-python - - selinux-policy-devel - lxc_xz_bin: xz lxc_cached_network_interfaces: