summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-09-21 15:50:44 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-09-27 10:48:30 +0200
commit1ae66cbdca5a1462d1c936a697c6084762715124 (patch)
treec8b1a49a0cbc12154c4211b4152ff1b5dd58c258
parent742d338d7c133c4670d6e887655edaf89949df8c (diff)
downloadopenshift-1ae66cbdca5a1462d1c936a697c6084762715124.tar.gz
openshift-1ae66cbdca5a1462d1c936a697c6084762715124.tar.bz2
openshift-1ae66cbdca5a1462d1c936a697c6084762715124.tar.xz
openshift-1ae66cbdca5a1462d1c936a697c6084762715124.zip
docker: use the image_tag on RHEL
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--roles/docker/tasks/systemcontainer_docker.yml11
1 files changed, 10 insertions, 1 deletions
diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml
index 146e5f430..292c83858 100644
--- a/roles/docker/tasks/systemcontainer_docker.yml
+++ b/roles/docker/tasks/systemcontainer_docker.yml
@@ -1,4 +1,5 @@
---
+
# 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
@@ -89,6 +90,14 @@
- name: Set to default prepend
set_fact:
l_docker_image_prepend: "gscrivano"
+ l_docker_image_tag: "latest"
+
+ - name: Set container engine image tag
+ set_fact:
+ l_docker_image_tag: "{{ 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:
@@ -102,7 +111,7 @@
- name: Set the full image name
set_fact:
- l_docker_image: "{{ l_docker_image_prepend }}/{{ openshift.docker.service_name }}:latest"
+ l_docker_image: "{{ l_docker_image_prepend }}/{{ openshift.docker.service_name }}:{{ l_docker_image_tag }}"
# For https://github.com/openshift/openshift-ansible/pull/5354#issuecomment-328552959
- name: Use a specific image if requested