diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-20 10:07:27 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-20 10:07:27 -0400 |
| commit | 3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341 (patch) | |
| tree | 36eaafd964e7a96f7f0d4272d3cc77d29272a52c /roles/openshift_node/tasks | |
| parent | 1f490c2374038669df3d2bfcb01af54361f8907e (diff) | |
| parent | bc11db0c73554be36b4196993d39a35cecbbd25b (diff) | |
| download | openshift-3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341.tar.gz openshift-3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341.tar.bz2 openshift-3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341.tar.xz openshift-3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341.zip | |
Merge pull request #1588 from sdodson/cluster-dns
Cluster dns provided by dnsmasq
Diffstat (limited to 'roles/openshift_node/tasks')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 8987e0191..06fde88af 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -9,13 +9,6 @@ role: "{{ item.role }}" local_facts: "{{ item.local_facts }}" with_items: - - role: common - local_facts: - # TODO: Replace this with a lookup or filter plugin. - # TODO: Move this to the node role - dns_ip: "{{ openshift_dns_ip - | default(openshift_master_cluster_vip - | default(None if openshift.common.version_gte_3_1_or_1_1 | bool else openshift_node_first_master_ip | default(None, true), true), true) }}" - role: node local_facts: annotations: "{{ openshift_node_annotations | default(none) }}" @@ -32,6 +25,7 @@ ovs_image: "{{ osn_ovs_image | default(None) }}" proxy_mode: "{{ openshift_node_proxy_mode | default('iptables') }}" local_quota_per_fsgroup: "{{ openshift_node_local_quota_per_fsgroup | default(None) }}" + dns_ip: "{{ openshift_dns_ip | default(none) | get_dns_ip(hostvars[inventory_hostname])}}" # We have to add tuned-profiles in the same transaction otherwise we run into depsolving # problems because the rpms don't pin the version properly. This was fixed in 3.1 packaging. |