From f9846a94a2ebd0f9417aeb8f9007f8acdba32b24 Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Mon, 20 Nov 2017 18:25:30 -0500 Subject: Fix system_images_registry variable Simplify the logic for this variable. --- roles/openshift_node/defaults/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'roles/openshift_node/defaults') diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml index 816338fa1..d249278dc 100644 --- a/roles/openshift_node/defaults/main.yml +++ b/roles/openshift_node/defaults/main.yml @@ -9,6 +9,12 @@ l_is_node_system_container: "{{ (openshift_use_node_system_container | default(o openshift_deployment_type: "{{ openshift_deployment_type | default('origin') }}" openshift_service_type: "{{ 'origin' if openshift_deployment_type == 'origin' else 'atomic-openshift' }}" +system_images_registry_dict: + openshift-enterprise: "registry.access.redhat.com" + origin: "docker.io" + +system_images_registry: "{{ system_images_registry_dict[openshift_deployment_type | default('origin')] }}" + openshift_image_tag: '' default_r_openshift_node_image_prep_packages: -- cgit v1.2.1