From f9846a94a2ebd0f9417aeb8f9007f8acdba32b24 Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Mon, 20 Nov 2017 18:25:30 -0500
Subject: Fix system_images_registry variable
Simplify the logic for this variable.
---
playbooks/init/facts.yml | 15 ---------------
1 file changed, 15 deletions(-)
(limited to 'playbooks/init')
diff --git a/playbooks/init/facts.yml b/playbooks/init/facts.yml
index c9a3448c7..7439313b7 100644
--- a/playbooks/init/facts.yml
+++ b/playbooks/init/facts.yml
@@ -103,20 +103,6 @@
or (openshift_use_node_system_container | default(False)) | bool
or (openshift_use_master_system_container | default(False)) | bool
- - name: Default system_images_registry to a enterprise registry
- set_fact:
- system_images_registry: "registry.access.redhat.com"
- when:
- - system_images_registry is not defined
- - openshift_deployment_type == "openshift-enterprise"
-
- - name: Default system_images_registry to community registry
- set_fact:
- system_images_registry: "docker.io"
- when:
- - system_images_registry is not defined
- - openshift_deployment_type == "origin"
-
- name: Gather Cluster facts and set is_containerized if needed
openshift_facts:
role: common
@@ -129,7 +115,6 @@
is_containerized: "{{ l_is_containerized | default(None) }}"
is_openvswitch_system_container: "{{ l_is_openvswitch_system_container | default(false) }}"
is_master_system_container: "{{ l_is_master_system_container | default(false) }}"
- system_images_registry: "{{ system_images_registry }}"
public_hostname: "{{ openshift_public_hostname | default(None) }}"
public_ip: "{{ openshift_public_ip | default(None) }}"
portal_net: "{{ openshift_portal_net | default(openshift_master_portal_net) | default(None) }}"
--
cgit v1.2.3