summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/templates/node.yaml.v1.j2
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-12-12 17:54:20 -0500
committerMichael Gugino <mgugino@redhat.com>2017-12-14 11:01:53 -0500
commit42d3824ba0d5a1e2cff3dc3a179cf02e735bc5da (patch)
treef569ee5399fdda29e97ef811ce5485c66ebd6557 /roles/openshift_node/templates/node.yaml.v1.j2
parent51a69d758e188b16126cca6f2791e2a00fe6ebad (diff)
downloadopenshift-42d3824ba0d5a1e2cff3dc3a179cf02e735bc5da.tar.gz
openshift-42d3824ba0d5a1e2cff3dc3a179cf02e735bc5da.tar.bz2
openshift-42d3824ba0d5a1e2cff3dc3a179cf02e735bc5da.tar.xz
openshift-42d3824ba0d5a1e2cff3dc3a179cf02e735bc5da.zip
Remove openshift_node_facts part 1
This commit removes some items from openshift_facts for the openshit_node role.
Diffstat (limited to 'roles/openshift_node/templates/node.yaml.v1.j2')
-rw-r--r--roles/openshift_node/templates/node.yaml.v1.j210
1 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2
index 16fdde02e..3bef1fe6b 100644
--- a/roles/openshift_node/templates/node.yaml.v1.j2
+++ b/roles/openshift_node/templates/node.yaml.v1.j2
@@ -10,12 +10,12 @@ dnsIP: {{ openshift.node.dns_ip }}
{% endif %}
dockerConfig:
execHandlerName: ""
-iptablesSyncPeriod: "{{ openshift.node.iptables_sync_period }}"
+iptablesSyncPeriod: "{{ openshift_node_iptables_sync_period }}"
imageConfig:
format: {{ openshift.node.registry_url }}
latest: {{ openshift_node_image_config_latest }}
kind: NodeConfig
-kubeletArguments: {{ openshift.node.kubelet_args | default(None) | to_padded_yaml(level=1) }}
+kubeletArguments: {{ l2_openshift_node_kubelet_args | default(None) | to_padded_yaml(level=1) }}
{% if openshift_use_crio %}
container-runtime:
- remote
@@ -45,7 +45,7 @@ networkConfig:
{% if openshift_node_use_openshift_sdn | bool or openshift_node_use_nuage | bool or openshift_node_use_contiv | bool or openshift_node_use_kuryr | bool or openshift_node_sdn_network_plugin_name == 'cni' %}
networkPluginName: {{ openshift_node_sdn_network_plugin_name }}
{% endif %}
-{% if openshift.node.set_node_ip | bool %}
+{% if openshift_set_node_ip | bool %}
nodeIP: {{ openshift.common.ip }}
{% endif %}
nodeName: {{ openshift.node.nodename }}
@@ -68,8 +68,8 @@ volumeDirectory: {{ openshift_node_data_dir }}/openshift.local.volumes
{% if not (openshift_node_use_kuryr | default(False)) | bool %}
proxyArguments:
proxy-mode:
- - {{ openshift.node.proxy_mode }}
+ - {{ openshift_node_proxy_mode }}
{% endif %}
volumeConfig:
localQuota:
- perFSGroup: {{ openshift.node.local_quota_per_fsgroup }}
+ perFSGroup: {{ openshift_node_local_quota_per_fsgroup }}