summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/templates/node.yaml.v1.j2
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-12-18 14:33:43 -0500
committerMichael Gugino <mgugino@redhat.com>2017-12-18 14:33:43 -0500
commit23b283e22982c032db341b7b4d81a384f0ec0b71 (patch)
treed3ba81605995f802fc32a08de13bd572f9980a8c /roles/openshift_node/templates/node.yaml.v1.j2
parentb713000887c5ef1d84d376038aacd0c6966d1692 (diff)
downloadopenshift-23b283e22982c032db341b7b4d81a384f0ec0b71.tar.gz
openshift-23b283e22982c032db341b7b4d81a384f0ec0b71.tar.bz2
openshift-23b283e22982c032db341b7b4d81a384f0ec0b71.tar.xz
openshift-23b283e22982c032db341b7b4d81a384f0ec0b71.zip
Remove openshift_node_facts role
This commit removes the remainder of openshift_node_facts role.
Diffstat (limited to 'roles/openshift_node/templates/node.yaml.v1.j2')
-rw-r--r--roles/openshift_node/templates/node.yaml.v1.j26
1 files changed, 2 insertions, 4 deletions
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2
index b673733df..76e75297a 100644
--- a/roles/openshift_node/templates/node.yaml.v1.j2
+++ b/roles/openshift_node/templates/node.yaml.v1.j2
@@ -5,14 +5,12 @@ dnsBindAddress: 127.0.0.1:53
dnsRecursiveResolvConf: /etc/origin/node/resolv.conf
{% endif %}
dnsDomain: {{ openshift.common.dns_domain }}
-{% if 'dns_ip' in openshift.node %}
-dnsIP: {{ openshift.node.dns_ip }}
-{% endif %}
+dnsIP: {{ openshift_dns_ip }}
dockerConfig:
execHandlerName: ""
iptablesSyncPeriod: "{{ openshift_node_iptables_sync_period }}"
imageConfig:
- format: {{ openshift.node.registry_url }}
+ format: {{ oreg_url_node }}
latest: {{ openshift_node_image_config_latest }}
kind: NodeConfig
kubeletArguments: {{ l2_openshift_node_kubelet_args | default(None) | to_padded_yaml(level=1) }}