Skip to content

Commit c7cc31b

Browse files
committed
system-containers: Fallback for system_images_registry
1 parent 8d3d176 commit c7cc31b

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

playbooks/common/openshift-cluster/initialize_facts.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,20 @@
108108
when:
109109
- l_any_system_container | bool
110110

111+
- name: Default system_images_registry to a enterprise registry
112+
set_fact:
113+
system_images_registry: "registry.access.redhat.com"
114+
when:
115+
- system_images_registry is not defined
116+
- openshift_deployment_type == "openshift-enterprise"
117+
118+
- name: Default system_images_registry to community registry
119+
set_fact:
120+
system_images_registry: "docker.io"
121+
when:
122+
- system_images_registry is not defined
123+
- openshift_deployment_type == "origin"
124+
111125
- name: Gather Cluster facts and set is_containerized if needed
112126
openshift_facts:
113127
role: common
@@ -124,7 +138,7 @@
124138
is_master_system_container: "{{ l_is_master_system_container | default(false) }}"
125139
is_etcd_system_container: "{{ l_is_etcd_system_container | default(false) }}"
126140
etcd_runtime: "{{ l_etcd_runtime }}"
127-
system_images_registry: "{{ system_images_registry | default('') }}"
141+
system_images_registry: "{{ system_images_registry }}"
128142
public_hostname: "{{ openshift_public_hostname | default(None) }}"
129143
public_ip: "{{ openshift_public_ip | default(None) }}"
130144
portal_net: "{{ openshift_portal_net | default(openshift_master_portal_net) | default(None) }}"

0 commit comments

Comments
 (0)