Set default number of registry replicas to 1

Infra nodes might not be in Ready state by the timel_default_replicas is
calculated. In order to prevent no registry pods to be
deployed the default number of replicas should be 1.

Additional registry pods can be deployed by
setting openshift_hosted_registry_replicas var

roles/openshift_hosted/defaults/main.yml

@@ -116,3 +116,5 @@ openshift_hosted_docker_registry_insecure_default: "{{ openshift_docker_hosted_r
 openshift_hosted_docker_registry_insecure: "{{ openshift_hosted_docker_registry_insecure_default }}"
 
 openshift_hosted_registry_storage_azure_blob_realm: core.windows.net
+
+openshift_hosted_registry_replicas: 1

roles/openshift_hosted/tasks/registry.yml

@@ -7,35 +7,6 @@
     l_openshift_hosted_fw_allow: "{{ r_openshift_hosted_registry_os_firewall_allow }}"
     l_openshift_hosted_fw_deny: "{{ r_openshift_hosted_registry_os_firewall_deny }}"
 
-- when: openshift_hosted_registry_replicas | default(none) is none
-  block:
-  - name: Retrieve list of openshift nodes matching registry selector
-    oc_obj:
-      state: list
-      kind: node
-      selector: "{{ openshift_hosted_registry_selector }}"
-    register: registry_nodes
-
-  - name: set_fact l_node_count to number of nodes matching registry selector
-    set_fact:
-      l_node_count: "{{ registry_nodes.results.results[0]['items'] | length }}"
-
-  # Determine the default number of registry/router replicas to use if no count
-  # has been specified.
-  # If no registry nodes defined, the default should be 0.
-  - name: set_fact l_default_replicas when l_node_count == 0
-    set_fact:
-      l_default_replicas: 0
-    when: l_node_count | int == 0
-
-  # If registry nodes are defined and the registry storage kind is
-  # defined, default should be the number of registry nodes, otherwise
-  # just 1:
-  - name: set_fact l_default_replicas when l_node_count > 0
-    set_fact:
-      l_default_replicas: "{{ l_node_count if openshift_hosted_registry_storage_kind | default(none) is not none else 1 }}"
-    when: l_node_count | int > 0
-
 - name: set openshift_hosted facts
   set_fact:
     # This determines the gluster_ips to use for the registry by looping over the glusterfs_registry group
@@ -118,7 +89,7 @@
     name: "{{ openshift_hosted_registry_name }}"
     namespace: "{{ openshift_hosted_registry_namespace }}"
     selector: "{{ openshift_hosted_registry_selector }}"
-    replicas: "{{ openshift_hosted_registry_replicas | default(l_default_replicas) }}"
+    replicas: "{{ openshift_hosted_registry_replicas }}"
     service_account: "{{ openshift_hosted_registry_serviceaccount }}"
     images: "{{ openshift_hosted_registry_registryurl }}"
     env_vars: "{{ openshift_hosted_registry_env_vars }}"

roles/openshift_hosted/tasks/storage/glusterfs.yml

@@ -17,7 +17,7 @@
   until:
   - "registry_pods.results.results[0]['items'] | count > 0"
   # There must be as many matching pods with 'Ready' status True as there are expected replicas
-  - "registry_pods.results.results[0]['items'] | lib_utils_oo_collect(attribute='status.conditions') | lib_utils_oo_collect(attribute='status', filters={'type': 'Ready'}) | map('bool') | select | list | count == openshift_hosted_registry_replicas | default(l_default_replicas) | int"
+  - "registry_pods.results.results[0]['items'] | lib_utils_oo_collect(attribute='status.conditions') | lib_utils_oo_collect(attribute='status', filters={'type': 'Ready'}) | map('bool') | select | list | count == openshift_hosted_registry_replicas | int"
   delay: 10
   retries: "{{ (600 / 10) | int }}"