summaryrefslogtreecommitdiffstats
path: root/roles/docker
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-10-10 10:41:45 -0400
committerGitHub <noreply@github.com>2017-10-10 10:41:45 -0400
commitd3108f4f593a0cb75b206256df37c3f47aed4988 (patch)
treebf96c66b69a9b896d6cb3ceef2c0c1b430bb601d /roles/docker
parentfb14c502b339bcdf2f7dcdeaa3ba890525eedc18 (diff)
parent085fef98783c2cf54b5a14b9e6753c87144182ee (diff)
downloadopenshift-d3108f4f593a0cb75b206256df37c3f47aed4988.tar.gz
openshift-d3108f4f593a0cb75b206256df37c3f47aed4988.tar.bz2
openshift-d3108f4f593a0cb75b206256df37c3f47aed4988.tar.xz
openshift-d3108f4f593a0cb75b206256df37c3f47aed4988.zip
Merge pull request #5711 from giuseppe/docker-crio-expect-openshiftrelease-with-v
crio, docker: expect openshift_release to have 'v'
Diffstat (limited to 'roles/docker')
-rw-r--r--roles/docker/tasks/systemcontainer_crio.yml2
-rw-r--r--roles/docker/tasks/systemcontainer_docker.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml
index 6ad62babc..fdc6cd24a 100644
--- a/roles/docker/tasks/systemcontainer_crio.yml
+++ b/roles/docker/tasks/systemcontainer_crio.yml
@@ -25,7 +25,7 @@
- openshift_release == "latest"
- set_fact:
- l_openshift_image_tag: "v{{ openshift_release | string }}"
+ l_openshift_image_tag: "{{ openshift_release | string }}"
when:
- openshift_image_tag is not defined
- openshift_release != "latest"
diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml
index a8804a132..15c6a55db 100644
--- a/roles/docker/tasks/systemcontainer_docker.yml
+++ b/roles/docker/tasks/systemcontainer_docker.yml
@@ -11,7 +11,7 @@
- openshift_release == "latest"
- set_fact:
- l_openshift_image_tag: "v{{ openshift_release | string }}"
+ l_openshift_image_tag: "{{ openshift_release | string }}"
when:
- openshift_image_tag is not defined
- openshift_release != "latest"