From e6e8c13d7d65c81c287a5b53403866db8280a5bf Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Thu, 11 Jan 2018 18:08:57 +0100 Subject: Set default image tag to openshift_image_tag for services Signed-off-by: Vadim Rutkovsky --- roles/openshift_service_catalog/vars/default_images.yml | 2 +- roles/openshift_service_catalog/vars/openshift-enterprise.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/openshift_service_catalog') diff --git a/roles/openshift_service_catalog/vars/default_images.yml b/roles/openshift_service_catalog/vars/default_images.yml index 6fb9d1b86..b3bb16f18 100644 --- a/roles/openshift_service_catalog/vars/default_images.yml +++ b/roles/openshift_service_catalog/vars/default_images.yml @@ -1,3 +1,3 @@ --- __openshift_service_catalog_image_prefix: "docker.io/openshift/origin-" -__openshift_service_catalog_image_version: "latest" +__openshift_service_catalog_image_version: "{{ openshift_service_catalog_image_version | default(openshift_image_tag) }}" diff --git a/roles/openshift_service_catalog/vars/openshift-enterprise.yml b/roles/openshift_service_catalog/vars/openshift-enterprise.yml index cab9cc7d8..7f56292a2 100644 --- a/roles/openshift_service_catalog/vars/openshift-enterprise.yml +++ b/roles/openshift_service_catalog/vars/openshift-enterprise.yml @@ -1,3 +1,3 @@ --- __openshift_service_catalog_image_prefix: "registry.access.redhat.com/openshift3/ose-" -__openshift_service_catalog_image_version: "v3.7" +__openshift_service_catalog_image_version: "{{ openshift_service_catalog_image_version | default(openshift_image_tag) }}" -- cgit v1.2.1