diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-21 13:09:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-21 13:09:40 -0400 |
| commit | 19b6794f877e723c0828e6e592dfaa99f0207d18 (patch) | |
| tree | 367822547e4d3ffbf0c67b1dac8e3aa8dc72540a | |
| parent | d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427 (diff) | |
| parent | d74d10d7cfa657b4e4bd74e3e40251de226c377b (diff) | |
| download | openshift-19b6794f877e723c0828e6e592dfaa99f0207d18.tar.gz openshift-19b6794f877e723c0828e6e592dfaa99f0207d18.tar.bz2 openshift-19b6794f877e723c0828e6e592dfaa99f0207d18.tar.xz openshift-19b6794f877e723c0828e6e592dfaa99f0207d18.zip | |
Merge pull request #2192 from abutcher/replicas
Bug 1358723 - openshift_hosted_router_replicas option didn't work
| -rw-r--r-- | roles/openshift_hosted/tasks/registry/registry.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_hosted/tasks/router/router.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_hosted/tasks/registry/registry.yml b/roles/openshift_hosted/tasks/registry/registry.yml index a242ce30f..a1edef132 100644 --- a/roles/openshift_hosted/tasks/registry/registry.yml +++ b/roles/openshift_hosted/tasks/registry/registry.yml @@ -9,7 +9,7 @@ when: openshift.hosted.registry.replicas | default(none) is none - set_fact: - replicas: "{{ openshift.hosted.registry.replicas | default(((openshift_hosted_registry_nodes_json.stdout | from_json)['items'] | length) if openshift.hosted.registry.storage.kind | default(none) is not none else 1) }}" + 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) }}" - name: Create OpenShift registry command: > diff --git a/roles/openshift_hosted/tasks/router/router.yml b/roles/openshift_hosted/tasks/router/router.yml index dfea8ca4b..7f3731c7d 100644 --- a/roles/openshift_hosted/tasks/router/router.yml +++ b/roles/openshift_hosted/tasks/router/router.yml @@ -44,7 +44,7 @@ when: openshift.hosted.router.replicas | default(none) is none - set_fact: - replicas: "{{ openshift.hosted.router.replicas | default((openshift_hosted_router_nodes_json.stdout | from_json)['items'] | length) }}" + replicas: "{{ openshift.hosted.router.replicas | default((openshift_hosted_router_nodes_json.stdout | default('{\"items\":[]}') | from_json)['items'] | length) }}" - name: Create OpenShift router command: > |