diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-03 08:41:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 08:41:23 -0700 |
| commit | ee0a668a8848b6d707a57de1b908584cf0b28d5d (patch) | |
| tree | 4443fac17c743ade86d6a8280ea54e5633f80709 /roles/docker/tasks/main.yml | |
| parent | 04a17c28991a7f3c2cdade24b4aed4313616cfec (diff) | |
| parent | 1f2325aa3d07679f842dc106a3cb2048564b9539 (diff) | |
| download | openshift-ee0a668a8848b6d707a57de1b908584cf0b28d5d.tar.gz openshift-ee0a668a8848b6d707a57de1b908584cf0b28d5d.tar.bz2 openshift-ee0a668a8848b6d707a57de1b908584cf0b28d5d.tar.xz openshift-ee0a668a8848b6d707a57de1b908584cf0b28d5d.zip | |
Merge pull request #5490 from giuseppe/set-crio-docker-tag-for-ose
Automatic merge from submit-queue.
CRI-O, Docker: set the tag to the OpenShift release on RHEL
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1493376
Diffstat (limited to 'roles/docker/tasks/main.yml')
| -rw-r--r-- | roles/docker/tasks/main.yml | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 7ece0e061..dae17c3ce 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -10,20 +10,28 @@ l_use_crio: "{{ openshift_use_crio | default(False) }}" l_use_crio_only: "{{ openshift_use_crio_only | default(False) }}" +- when: + - openshift_deployment_type == 'openshift-enterprise' + assert: + that: + - "openshift_image_tag is defined" + msg: > + openshift_image_tag is a required inventory variable when installing openshift-enterprise + - name: Use Package Docker if Requested include: package_docker.yml when: - - not l_use_system_container - - not l_use_crio_only + - not l_use_system_container + - not l_use_crio_only - name: Use System Container Docker if Requested include: systemcontainer_docker.yml when: - - l_use_system_container - - not l_use_crio_only + - l_use_system_container + - not l_use_crio_only - name: Add CRI-O usage Requested include: systemcontainer_crio.yml when: - - l_use_crio - - inventory_hostname in groups['oo_masters_to_config'] or inventory_hostname in groups['oo_nodes_to_config'] + - l_use_crio + - inventory_hostname in groups['oo_masters_to_config'] or inventory_hostname in groups['oo_nodes_to_config'] |