diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-03-07 14:24:57 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-04-19 16:44:18 -0400 |
| commit | bc11db0c73554be36b4196993d39a35cecbbd25b (patch) | |
| tree | 36eaafd964e7a96f7f0d4272d3cc77d29272a52c /roles/openshift_node | |
| parent | 7c11c212a270ea4da9094ed3156db91090b8c851 (diff) | |
| download | openshift-bc11db0c73554be36b4196993d39a35cecbbd25b.tar.gz openshift-bc11db0c73554be36b4196993d39a35cecbbd25b.tar.bz2 openshift-bc11db0c73554be36b4196993d39a35cecbbd25b.tar.xz openshift-bc11db0c73554be36b4196993d39a35cecbbd25b.zip | |
Add openshift_node_dnsmasq
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/meta/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 9 | ||||
| -rw-r--r-- | roles/openshift_node/templates/node.yaml.v1.j2 | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/roles/openshift_node/meta/main.yml b/roles/openshift_node/meta/main.yml index 84ba9ac2e..ca0c332ea 100644 --- a/roles/openshift_node/meta/main.yml +++ b/roles/openshift_node/meta/main.yml @@ -15,3 +15,6 @@ dependencies: - role: openshift_docker - role: openshift_cloud_provider - role: openshift_common +- role: openshift_node_dnsmasq + when: openshift.common.use_dnsmasq + diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 94a5d9da8..06fde88af 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -9,14 +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) }}" - portal_net: "{{ openshift_portal_net | default(openshift_master_portal_net) | default(None) }}" - role: node local_facts: annotations: "{{ openshift_node_annotations | default(none) }}" @@ -33,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. diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2 index 28cb1ea26..9ba1a01dd 100644 --- a/roles/openshift_node/templates/node.yaml.v1.j2 +++ b/roles/openshift_node/templates/node.yaml.v1.j2 @@ -1,8 +1,8 @@ allowDisabledDocker: false apiVersion: v1 dnsDomain: {{ openshift.common.dns_domain }} -{% if 'dns_ip' in openshift.common %} -dnsIP: {{ openshift.common.dns_ip }} +{% if 'dns_ip' in openshift.node %} +dnsIP: {{ openshift.node.dns_ip }} {% endif %} dockerConfig: execHandlerName: "" |