summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-10-09 12:24:56 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-10-09 12:25:22 +0200
commitcc4fc9acc92839ac9eded80485d047b77abe19de (patch)
treeb52c13cf85629d181e3e2a51dd45468917719c11
parentc880a7d1e996d5e88e50b4055613d4c0fd3c6988 (diff)
downloadopenshift-cc4fc9acc92839ac9eded80485d047b77abe19de.tar.gz
openshift-cc4fc9acc92839ac9eded80485d047b77abe19de.tar.bz2
openshift-cc4fc9acc92839ac9eded80485d047b77abe19de.tar.xz
openshift-cc4fc9acc92839ac9eded80485d047b77abe19de.zip
crio, docker: use openshift_release when openshift_image_tag is not used
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--roles/docker/tasks/main.yml8
-rw-r--r--roles/docker/tasks/systemcontainer_crio.yml19
-rw-r--r--roles/docker/tasks/systemcontainer_docker.yml19
3 files changed, 34 insertions, 12 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index dae17c3ce..f73f90686 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -10,14 +10,6 @@
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:
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml
index 99ab11fd0..6ad62babc 100644
--- a/roles/docker/tasks/systemcontainer_crio.yml
+++ b/roles/docker/tasks/systemcontainer_crio.yml
@@ -14,6 +14,22 @@
l_additional_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l_crio_registries)) }}"
when: l2_docker_additional_registries
+- set_fact:
+ l_openshift_image_tag: "{{ openshift_image_tag | string }}"
+ when: openshift_image_tag is defined
+
+- set_fact:
+ l_openshift_image_tag: "latest"
+ when:
+ - openshift_image_tag is not defined
+ - openshift_release == "latest"
+
+- set_fact:
+ l_openshift_image_tag: "v{{ openshift_release | string }}"
+ when:
+ - openshift_image_tag is not defined
+ - openshift_release != "latest"
+
- name: Ensure container-selinux is installed
package:
name: container-selinux
@@ -106,10 +122,9 @@
- name: Set CRI-O image tag
set_fact:
- l_crio_image_tag: "{{ openshift_image_tag }}"
+ l_crio_image_tag: "{{ l_openshift_image_tag }}"
when:
- openshift_deployment_type == 'openshift-enterprise'
- - openshift_image_tag is defined
- name: Use RHEL based image when distribution is Red Hat
set_fact:
diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml
index 5b1605b58..a8804a132 100644
--- a/roles/docker/tasks/systemcontainer_docker.yml
+++ b/roles/docker/tasks/systemcontainer_docker.yml
@@ -1,5 +1,21 @@
---
+- set_fact:
+ l_openshift_image_tag: "{{ openshift_image_tag | string }}"
+ when: openshift_image_tag is defined
+
+- set_fact:
+ l_openshift_image_tag: "latest"
+ when:
+ - openshift_image_tag is not defined
+ - openshift_release == "latest"
+
+- set_fact:
+ l_openshift_image_tag: "v{{ openshift_release | string }}"
+ when:
+ - openshift_image_tag is not defined
+ - openshift_release != "latest"
+
# If docker_options are provided we should fail. We should not install docker and ignore
# the users configuration. NOTE: docker_options == inventory:openshift_docker_options
- name: Fail quickly if openshift_docker_options are set
@@ -94,10 +110,9 @@
- name: Set container engine image tag
set_fact:
- l_docker_image_tag: "{{ openshift_image_tag }}"
+ l_docker_image_tag: "{{ l_openshift_image_tag }}"
when:
- openshift_deployment_type == 'openshift-enterprise'
- - openshift_image_tag is defined
- name: Use Red Hat Registry for image when distribution is Red Hat
set_fact: