summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-06 16:32:29 -0400
committerGitHub <noreply@github.com>2017-07-06 16:32:29 -0400
commit31e8666a29eab6b8b0580e3df583ce12d91d8fde (patch)
treebaea8c6c85dcd45558c29dc170bc8b9c332fb16f
parent99ff4fdca9a24a1d5e3953fc7836aee898e62101 (diff)
parentd83482764004c0f3d24765a4946a0ebe632a7c2c (diff)
downloadopenshift-31e8666a29eab6b8b0580e3df583ce12d91d8fde.tar.gz
openshift-31e8666a29eab6b8b0580e3df583ce12d91d8fde.tar.bz2
openshift-31e8666a29eab6b8b0580e3df583ce12d91d8fde.tar.xz
openshift-31e8666a29eab6b8b0580e3df583ce12d91d8fde.zip
Merge pull request #4702 from ashcrow/atomic-command-workarounds
Atomic command workarounds
-rw-r--r--roles/docker/tasks/systemcontainer_docker.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml
index 650f06f86..1da8966d8 100644
--- a/roles/docker/tasks/systemcontainer_docker.yml
+++ b/roles/docker/tasks/systemcontainer_docker.yml
@@ -12,6 +12,12 @@
traditional docker package install. Otherwise, comment out openshift_docker_options
in your inventory file.
+- name: Ensure container-selinux is installed
+ package:
+ name: container-selinux
+ state: present
+ when: not openshift.common.is_atomic | bool
+
# Used to pull and install the system container
- name: Ensure atomic is installed
package: