diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-27 17:05:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-27 17:05:58 -0400 |
| commit | 70e535c23eb99bbce590b5da29cbaf0cf1d2da28 (patch) | |
| tree | 2c30df4b81520322497c11f5c00100796dda9f0a /roles/openshift_hosted/tasks/registry/registry.yml | |
| parent | d4246bb6063383b7bb55a7c5a28d575214697f3c (diff) | |
| parent | 4f2f94b69c41b116515dedb5039194085e17bb19 (diff) | |
| download | openshift-70e535c23eb99bbce590b5da29cbaf0cf1d2da28.tar.gz openshift-70e535c23eb99bbce590b5da29cbaf0cf1d2da28.tar.bz2 openshift-70e535c23eb99bbce590b5da29cbaf0cf1d2da28.tar.xz openshift-70e535c23eb99bbce590b5da29cbaf0cf1d2da28.zip | |
Merge pull request #2224 from dgoodwin/infra-count-fix
Fix registry/router being created despite no infra nodes.
Diffstat (limited to 'roles/openshift_hosted/tasks/registry/registry.yml')
| -rw-r--r-- | roles/openshift_hosted/tasks/registry/registry.yml | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/roles/openshift_hosted/tasks/registry/registry.yml b/roles/openshift_hosted/tasks/registry/registry.yml index a1edef132..08c7e944e 100644 --- a/roles/openshift_hosted/tasks/registry/registry.yml +++ b/roles/openshift_hosted/tasks/registry/registry.yml @@ -9,7 +9,22 @@ when: openshift.hosted.registry.replicas | default(none) is none - set_fact: - replicas: "{{ openshift.hosted.registry.replicas | default(((openshift_hosted_registry_nodes_json.stdout | default('{\"items\":[]}') | from_json)['items'] | length) if openshift.hosted.registry.storage.kind | default(none) is not none else 1) }}" + l_node_count: "{{ (openshift_hosted_registry_nodes_json.stdout | default('{\"items\":[]}') | from_json)['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. +- 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: +- 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 + +- set_fact: + replicas: "{{ openshift.hosted.registry.replicas | default(l_default_replicas) }}" - name: Create OpenShift registry command: > @@ -32,9 +47,10 @@ register: openshift_hosted_registry_results changed_when: "'service exists' not in openshift_hosted_registry_results.stdout" failed_when: "openshift_hosted_registry_results.rc != 0 and 'service exists' not in openshift_hosted_registry_results.stdout and 'deployment_config' not in openshift_hosted_registry_results.stderr and 'service' not in openshift_hosted_registry_results.stderr" + when: replicas | int > 0 - include: storage/object_storage.yml - when: openshift.hosted.registry.storage.kind | default(none) == 'object' + when: replicas | int > 0 and openshift.hosted.registry.storage.kind | default(none) == 'object' - include: storage/persistent_volume.yml - when: openshift.hosted.registry.storage.kind | default(none) in ['nfs', 'openstack'] + when: replicas | int > 0 and openshift.hosted.registry.storage.kind | default(none) in ['nfs', 'openstack'] |