diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-02 18:57:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-02 18:57:46 -0400 |
| commit | 4d70c314f0f42d6443145b87329dd4a81b59f80e (patch) | |
| tree | 0a0a8b11af0f1739368e9a48b4c220f863d793ba | |
| parent | ee9413cebdb8a7c5ff03a5da767b1c74742bc898 (diff) | |
| parent | 291490d2245f4bb036f39ab63845a9ece52ec575 (diff) | |
| download | openshift-4d70c314f0f42d6443145b87329dd4a81b59f80e.tar.gz openshift-4d70c314f0f42d6443145b87329dd4a81b59f80e.tar.bz2 openshift-4d70c314f0f42d6443145b87329dd4a81b59f80e.tar.xz openshift-4d70c314f0f42d6443145b87329dd4a81b59f80e.zip | |
Merge pull request #2250 from abutcher/hosted-nodes
Rename router and registry node list variables.
| -rw-r--r-- | roles/openshift_hosted/tasks/registry/registry.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_hosted/tasks/router/router.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_hosted/tasks/registry/registry.yml b/roles/openshift_hosted/tasks/registry/registry.yml index 08c7e944e..fc037ceda 100644 --- a/roles/openshift_hosted/tasks/registry/registry.yml +++ b/roles/openshift_hosted/tasks/registry/registry.yml @@ -4,12 +4,12 @@ {{ openshift.common.client_binary }} --api-version='v1' -o json get nodes -n default --config={{ openshift_hosted_kubeconfig }} --selector={{ openshift.hosted.registry.selector | default('') }} - register: openshift_hosted_registry_nodes_json + register: registry_nodes_json changed_when: false when: openshift.hosted.registry.replicas | default(none) is none - set_fact: - l_node_count: "{{ (openshift_hosted_registry_nodes_json.stdout | default('{\"items\":[]}') | from_json)['items'] | length }}" + l_node_count: "{{ (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. diff --git a/roles/openshift_hosted/tasks/router/router.yml b/roles/openshift_hosted/tasks/router/router.yml index d0a129c95..e18b9781c 100644 --- a/roles/openshift_hosted/tasks/router/router.yml +++ b/roles/openshift_hosted/tasks/router/router.yml @@ -39,12 +39,12 @@ {{ openshift.common.client_binary }} --api-version='v1' -o json get nodes -n default --config={{ openshift_hosted_kubeconfig }} --selector={{ openshift.hosted.router.selector | default('') }} - register: openshift_hosted_router_nodes_json + register: router_nodes_json changed_when: false when: openshift.hosted.router.replicas | default(none) is none - set_fact: - replicas: "{{ openshift.hosted.router.replicas | default((openshift_hosted_router_nodes_json.stdout | default('{\"items\":[]}') | from_json)['items'] | length) }}" + replicas: "{{ openshift.hosted.router.replicas | default((router_nodes_json.stdout | default('{\"items\":[]}') | from_json)['items'] | length) }}" - name: Create OpenShift router command: > |