summaryrefslogtreecommitdiffstats
path: root/roles/docker
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-10-16 13:41:13 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-10-16 14:49:47 +0200
commit2f199512270630aa73c61c1d7cbc0e9a845cb4b5 (patch)
tree41c053d9c8202a1717dce434a362ab813a29f244 /roles/docker
parentb0ba3dc4b11199c5ccae37bdc452e3e35e225edc (diff)
downloadopenshift-2f199512270630aa73c61c1d7cbc0e9a845cb4b5.tar.gz
openshift-2f199512270630aa73c61c1d7cbc0e9a845cb4b5.tar.bz2
openshift-2f199512270630aa73c61c1d7cbc0e9a845cb4b5.tar.xz
openshift-2f199512270630aa73c61c1d7cbc0e9a845cb4b5.zip
cri-o: error out when node is a Docker container
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1489555 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'roles/docker')
-rw-r--r--roles/docker/tasks/systemcontainer_crio.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml
index fdc6cd24a..a79600930 100644
--- a/roles/docker/tasks/systemcontainer_crio.yml
+++ b/roles/docker/tasks/systemcontainer_crio.yml
@@ -36,6 +36,12 @@
state: present
when: not openshift.common.is_atomic | bool
+- name: Check we are not using node as a Docker container with CRI-O
+ fail: msg='Cannot use CRI-O with node configured as a Docker container'
+ when:
+ - openshift.common.is_containerized | bool
+ - not openshift.common.is_node_system_container | bool
+
# Used to pull and install the system container
- name: Ensure atomic is installed
package: