summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-08-08 15:33:50 -0400
committerSteve Milner <smilner@redhat.com>2017-08-25 14:00:01 -0400
commitc7cc31bf2d294a8d7996d9928226ac036da2ec90 (patch)
tree8cadcdcbac20b020f02d040ff9d2c02e4a315f84
parent8d3d176d9a4d674d1b576c4295287ccb55c3bfb1 (diff)
downloadopenshift-c7cc31bf2d294a8d7996d9928226ac036da2ec90.tar.gz
openshift-c7cc31bf2d294a8d7996d9928226ac036da2ec90.tar.bz2
openshift-c7cc31bf2d294a8d7996d9928226ac036da2ec90.tar.xz
openshift-c7cc31bf2d294a8d7996d9928226ac036da2ec90.zip
system-containers: Fallback for system_images_registry
-rw-r--r--playbooks/common/openshift-cluster/initialize_facts.yml16
1 files changed, 15 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_facts.yml b/playbooks/common/openshift-cluster/initialize_facts.yml
index 4bf5d33b1..d9919acd9 100644
--- a/playbooks/common/openshift-cluster/initialize_facts.yml
+++ b/playbooks/common/openshift-cluster/initialize_facts.yml
@@ -108,6 +108,20 @@
when:
- l_any_system_container | 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
@@ -124,7 +138,7 @@
is_master_system_container: "{{ l_is_master_system_container | default(false) }}"
is_etcd_system_container: "{{ l_is_etcd_system_container | default(false) }}"
etcd_runtime: "{{ l_etcd_runtime }}"
- system_images_registry: "{{ system_images_registry | default('') }}"
+ 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) }}"