diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-07-21 10:56:22 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-07-21 11:31:24 -0400 |
| commit | d74d10d7cfa657b4e4bd74e3e40251de226c377b (patch) | |
| tree | 70c3c0e179345c883d239d3d4e7860c4b38816b3 | |
| parent | 893ffb6ec88b82d4607d9777ab741db1845d4f1e (diff) | |
| download | openshift-d74d10d7cfa657b4e4bd74e3e40251de226c377b.tar.gz openshift-d74d10d7cfa657b4e4bd74e3e40251de226c377b.tar.bz2 openshift-d74d10d7cfa657b4e4bd74e3e40251de226c377b.tar.xz openshift-d74d10d7cfa657b4e4bd74e3e40251de226c377b.zip | |
Default nodes matching selectors when not collected.
| -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: > |