From 8d3d176d9a4d674d1b576c4295287ccb55c3bfb1 Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Tue, 8 Aug 2017 15:29:07 -0400 Subject: inventory: Add system_images_registry example system_images_registry is required for system container installations but no example was put in the inventory files. This change adds a note saying the variable is required when using system containers and provides an example. Ref: https://github.com/openshift/openshift-ansible/pull/5024 --- inventory/byo/hosts.origin.example | 3 +++ inventory/byo/hosts.ose.example | 3 +++ 2 files changed, 6 insertions(+) diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 385278f3b..d034e0426 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 -- cgit v1.2.3 From c7cc31bf2d294a8d7996d9928226ac036da2ec90 Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Tue, 8 Aug 2017 15:33:50 -0400 Subject: system-containers: Fallback for system_images_registry --- playbooks/common/openshift-cluster/initialize_facts.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) 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) }}" -- cgit v1.2.3