summaryrefslogtreecommitdiffstats
path: root/playbooks/init
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2017-11-22 13:19:09 -0500
committerGitHub <noreply@github.com>2017-11-22 13:19:09 -0500
commitf983b99d4a4acd1e3922305190dbe854227cccc0 (patch)
tree3f467db738e30063b564112867e897e4c16012fe /playbooks/init
parent5889d10321ced514a1a235016bc4173895065474 (diff)
parentf9846a94a2ebd0f9417aeb8f9007f8acdba32b24 (diff)
downloadopenshift-f983b99d4a4acd1e3922305190dbe854227cccc0.tar.gz
openshift-f983b99d4a4acd1e3922305190dbe854227cccc0.tar.bz2
openshift-f983b99d4a4acd1e3922305190dbe854227cccc0.tar.xz
openshift-f983b99d4a4acd1e3922305190dbe854227cccc0.zip
Merge pull request #6201 from mgugino-upstream-stage/system-reg
Fix system_images_registry variable
Diffstat (limited to 'playbooks/init')
-rw-r--r--playbooks/init/facts.yml15
1 files changed, 0 insertions, 15 deletions
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) }}"