diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-28 10:31:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-28 10:31:34 -0400 |
| commit | f51bcec58b58801a30a4b32a99c5b1f8f9367680 (patch) | |
| tree | bf9a4e84f031252dfd949168352f163e37cf1419 | |
| parent | 89c405109d8ca5906d9beb03e7e2794267f5f357 (diff) | |
| parent | c7cc31bf2d294a8d7996d9928226ac036da2ec90 (diff) | |
| download | openshift-f51bcec58b58801a30a4b32a99c5b1f8f9367680.tar.gz openshift-f51bcec58b58801a30a4b32a99c5b1f8f9367680.tar.bz2 openshift-f51bcec58b58801a30a4b32a99c5b1f8f9367680.tar.xz openshift-f51bcec58b58801a30a4b32a99c5b1f8f9367680.zip | |
Merge pull request #5033 from ashcrow/system-images-registry-followup
System images registry followup
| -rw-r--r-- | inventory/byo/hosts.origin.example | 3 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 3 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/initialize_facts.yml | 16 |
3 files changed, 21 insertions, 1 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index fa0e0f6fe..396383725 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -56,6 +56,9 @@ openshift_release=v3.6 #openshift_use_node_system_container=False #openshift_use_master_system_container=False #openshift_use_etcd_system_container=False +# +# In either case, system_images_registry must be specified to be able to find the system images +#system_images_registry="docker.io" # Install the openshift examples #openshift_install_examples=true diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 87fdee904..fa4cc4f26 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -56,6 +56,9 @@ openshift_release=v3.6 #openshift_use_node_system_container=False #openshift_use_master_system_container=False #openshift_use_etcd_system_container=False +# +# In either case, system_images_registry must be specified to be able to find the system images +#system_images_registry="registry.access.redhat.com" # Install the openshift examples #openshift_install_examples=true diff --git a/playbooks/common/openshift-cluster/initialize_facts.yml b/playbooks/common/openshift-cluster/initialize_facts.yml index e90a49390..65be436c6 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 @@ -125,7 +139,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) }}" |