diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-08 12:52:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 12:52:04 -0500 |
| commit | 8b484281b6052b82869da8cc691e427ec9e1a0fc (patch) | |
| tree | f8d9a77d4a22caf1567b5b83cdbd83c5affd36fa /roles/openshift_version | |
| parent | 0beab180d22f28f3f529ca0252f23bb92a7b69a7 (diff) | |
| parent | 40d63b7dfa8b88ad2459a86b436385612dbb2150 (diff) | |
| download | openshift-8b484281b6052b82869da8cc691e427ec9e1a0fc.tar.gz openshift-8b484281b6052b82869da8cc691e427ec9e1a0fc.tar.bz2 openshift-8b484281b6052b82869da8cc691e427ec9e1a0fc.tar.xz openshift-8b484281b6052b82869da8cc691e427ec9e1a0fc.zip | |
Merge pull request #6316 from giuseppe/fix-syscontainers-installation
syscontainers: fix CRI-O and container-engine installation
Diffstat (limited to 'roles/openshift_version')
| -rw-r--r-- | roles/openshift_version/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_version/meta/main.yml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_version/defaults/main.yml b/roles/openshift_version/defaults/main.yml index 4adf04e90..354699637 100644 --- a/roles/openshift_version/defaults/main.yml +++ b/roles/openshift_version/defaults/main.yml @@ -6,3 +6,5 @@ openshift_service_type_dict: openshift-enterprise: atomic-openshift openshift_service_type: "{{ openshift_service_type_dict[openshift_deployment_type] }}" + +openshift_use_crio_only: False diff --git a/roles/openshift_version/meta/main.yml b/roles/openshift_version/meta/main.yml index 5d7683120..2d317700a 100644 --- a/roles/openshift_version/meta/main.yml +++ b/roles/openshift_version/meta/main.yml @@ -13,3 +13,5 @@ galaxy_info: - cloud dependencies: - role: lib_utils +- role: container_runtime +- role: openshift_facts |