diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-03 14:11:39 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-03 14:11:39 -0500 |
| commit | 64d40b71f3b52b69999831a7d6e13916ec5ad1cd (patch) | |
| tree | 9087a58294e551046962e1ea267c165a5a315290 /playbooks | |
| parent | 15aa17c6162c036f6b164f225d2a071c138af965 (diff) | |
| parent | 192ccc8e6e6f465351828f32e9dc43b840897b67 (diff) | |
| download | openshift-64d40b71f3b52b69999831a7d6e13916ec5ad1cd.tar.gz openshift-64d40b71f3b52b69999831a7d6e13916ec5ad1cd.tar.bz2 openshift-64d40b71f3b52b69999831a7d6e13916ec5ad1cd.tar.xz openshift-64d40b71f3b52b69999831a7d6e13916ec5ad1cd.zip | |
Merge pull request #1012 from abutcher/dns-ip-override
Refactor dns options and facts
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 3 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 16 |
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: |