diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-02-08 19:37:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-08 19:37:51 -0500 |
| commit | 0217c03b15bbf5ffcd5491f789de65ecb6e22ddd (patch) | |
| tree | 5549242064eea4c041db77078095da24bfc90bca /roles/openshift_logging_elasticsearch/tasks/get_es_version.yml | |
| parent | 2936995d7d24a8c81b81d1d473fc48b6a374f2b4 (diff) | |
| parent | 18f8c471157f60aeb0b2c64374dd9bede68320c4 (diff) | |
| download | openshift-0217c03b15bbf5ffcd5491f789de65ecb6e22ddd.tar.gz openshift-0217c03b15bbf5ffcd5491f789de65ecb6e22ddd.tar.bz2 openshift-0217c03b15bbf5ffcd5491f789de65ecb6e22ddd.tar.xz openshift-0217c03b15bbf5ffcd5491f789de65ecb6e22ddd.zip | |
Merge pull request #7068 from datarace/logging-fix
changed oc to {{ openshift_client_binary }}
Diffstat (limited to 'roles/openshift_logging_elasticsearch/tasks/get_es_version.yml')
| -rw-r--r-- | roles/openshift_logging_elasticsearch/tasks/get_es_version.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_logging_elasticsearch/tasks/get_es_version.yml b/roles/openshift_logging_elasticsearch/tasks/get_es_version.yml index 16de6f252..7c4ecaa5b 100644 --- a/roles/openshift_logging_elasticsearch/tasks/get_es_version.yml +++ b/roles/openshift_logging_elasticsearch/tasks/get_es_version.yml @@ -1,21 +1,21 @@ --- - command: > - oc get pod -l component=es,provider=openshift -n {{ openshift_logging_elasticsearch_namespace }} -o jsonpath={.items[?(@.status.phase==\"Running\")].metadata.name} + {{ openshift_client_binary }} get pod -l component=es,provider=openshift -n {{ openshift_logging_elasticsearch_namespace }} -o jsonpath={.items[?(@.status.phase==\"Running\")].metadata.name} register: _cluster_pods - name: "Getting ES version for logging-es cluster" command: > - oc exec {{ _cluster_pods.stdout.split(' ')[0] }} -c elasticsearch -n {{ openshift_logging_elasticsearch_namespace }} -- {{ __es_local_curl }} -XGET 'https://localhost:9200/' + {{ openshift_client_binary }} exec {{ _cluster_pods.stdout.split(' ')[0] }} -c elasticsearch -n {{ openshift_logging_elasticsearch_namespace }} -- {{ __es_local_curl }} -XGET 'https://localhost:9200/' register: _curl_output when: _cluster_pods.stdout_lines | count > 0 - command: > - oc get pod -l component=es-ops,provider=openshift -n {{ openshift_logging_elasticsearch_namespace }} -o jsonpath={.items[?(@.status.phase==\"Running\")].metadata.name} + {{ openshift_client_binary }} get pod -l component=es-ops,provider=openshift -n {{ openshift_logging_elasticsearch_namespace }} -o jsonpath={.items[?(@.status.phase==\"Running\")].metadata.name} register: _ops_cluster_pods - name: "Getting ES version for logging-es-ops cluster" command: > - oc exec {{ _ops_cluster_pods.stdout.split(' ')[0] }} -c elasticsearch -n {{ openshift_logging_elasticsearch_namespace }} -- {{ __es_local_curl }} -XGET 'https://localhost:9200/' + {{ openshift_client_binary }} exec {{ _ops_cluster_pods.stdout.split(' ')[0] }} -c elasticsearch -n {{ openshift_logging_elasticsearch_namespace }} -- {{ __es_local_curl }} -XGET 'https://localhost:9200/' register: _ops_curl_output when: _ops_cluster_pods.stdout_lines | count > 0 |