summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2015-12-01 16:30:05 -0500
committerAndrew Butcher <abutcher@redhat.com>2015-12-03 12:40:49 -0500
commit192ccc8e6e6f465351828f32e9dc43b840897b67 (patch)
treec562abf558ec654b0c3c8ba4411bb8070f23dda1 /playbooks/common
parent3780deb06c7d8f85bfb031fbce7778646cbf64ee (diff)
downloadopenshift-192ccc8e6e6f465351828f32e9dc43b840897b67.tar.gz
openshift-192ccc8e6e6f465351828f32e9dc43b840897b67.tar.bz2
openshift-192ccc8e6e6f465351828f32e9dc43b840897b67.tar.xz
openshift-192ccc8e6e6f465351828f32e9dc43b840897b67.zip
Refactor dns options and facts.
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/config.yml3
-rw-r--r--playbooks/common/openshift-master/config.yml16
2 files changed, 0 insertions, 19 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index a8bd634d3..482fa8441 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -6,6 +6,3 @@
- include: ../openshift-master/config.yml
- include: ../openshift-node/config.yml
- vars:
- osn_cluster_dns_domain: "{{ hostvars[groups.oo_first_master.0].openshift.dns.domain }}"
- osn_cluster_dns_ip: "{{ hostvars[groups.oo_first_master.0].cluster_dns_ip }}"
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 1c8a92122..785a78497 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -353,22 +353,6 @@
- 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
- # This command has to be on a single line.
- 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:
- cluster_dns_ip: "{{ hostvars[groups.oo_first_master.0].openshift.dns.ip }}"
- when: not openshift.common.version_greater_than_3_1_or_1_1 | bool
- - set_fact:
- cluster_dns_ip: "{{ master_service_ip_output.stdout }}"
- when: openshift.common.version_greater_than_3_1_or_1_1 | bool
-
- name: Enable cockpit
hosts: oo_first_master
vars: