diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-17 07:17:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-17 07:17:19 -0700 |
| commit | e8091b34a6aa0db61f639b4d0705519009cfc1e8 (patch) | |
| tree | 7c5dc6f3eddf69b73509d83e4578a5c03410e334 | |
| parent | 1d75eb325c0dbfd4614ab6e6535d07a2ea3ecbc3 (diff) | |
| parent | 2f199512270630aa73c61c1d7cbc0e9a845cb4b5 (diff) | |
| download | openshift-e8091b34a6aa0db61f639b4d0705519009cfc1e8.tar.gz openshift-e8091b34a6aa0db61f639b4d0705519009cfc1e8.tar.bz2 openshift-e8091b34a6aa0db61f639b4d0705519009cfc1e8.tar.xz openshift-e8091b34a6aa0db61f639b4d0705519009cfc1e8.zip | |
Merge pull request #5768 from giuseppe/crio-error-out-with-node-docker-container
Automatic merge from submit-queue.
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>
| -rw-r--r-- | roles/docker/tasks/systemcontainer_crio.yml | 6 |
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: |