summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-30 17:08:32 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-30 17:08:32 -0500
commitebf659b0c1775f9be3e52a8ef420d568656c10f9 (patch)
tree5cd73fde4bd35e4f8731df93bd6e818e5d203ed8 /playbooks/common/openshift-master
parent006674871103f597d6dbb6c6cd135635489cebaf (diff)
parent526038fa15a6c02661f2315278c086477157b87f (diff)
downloadopenshift-ebf659b0c1775f9be3e52a8ef420d568656c10f9.tar.gz
openshift-ebf659b0c1775f9be3e52a8ef420d568656c10f9.tar.bz2
openshift-ebf659b0c1775f9be3e52a8ef420d568656c10f9.tar.xz
openshift-ebf659b0c1775f9be3e52a8ef420d568656c10f9.zip
Merge pull request #964 from detiber/safePatch
Safe patch
Diffstat (limited to 'playbooks/common/openshift-master')
-rw-r--r--playbooks/common/openshift-master/config.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 43e7836b3..f382494bd 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -353,11 +353,16 @@
- role: openshift_cluster_metrics
when: openshift.common.use_cluster_metrics | bool
+ # TODO: Setting the cluster dns ip should be pushed into openshift-facts
- name: Determine cluster dns ip
hosts: oo_first_master
tasks:
- name: Get master service ip
- command: "{{ openshift.common.client_binary }} -n default --config={{ openshift.common.config_base }}/master/admin.kubeconfig get -o template svc kubernetes --template=\\{\\{.spec.clusterIP\\}\\}"
+ command: >
+ {{ openshift.common.client_binary }} -n default
+ --config={{ openshift.common.config_base }}/master/admin.kubeconfig
+ get -o template svc kubernetes --template=\\{\\{.spec.clusterIP\\}\\}
+ --output-version=v1
register: master_service_ip_output
when: openshift.common.version_greater_than_3_1_or_1_1 | bool
- set_fact: