diff options
| author | Diego Castro <spinolacastro@gmail.com> | 2015-08-22 18:10:17 -0300 |
|---|---|---|
| committer | Diego Castro <spinolacastro@gmail.com> | 2015-08-22 18:10:17 -0300 |
| commit | 055921cd545c12733949f37c1af2c0a1296216ec (patch) | |
| tree | 0ad645b9a75eacbb168c9fdc92d585867b5317a4 /roles/openshift_node/templates | |
| parent | 10b8c46d02d1ec9f4edf3df4b60e3bf533e73533 (diff) | |
| parent | 922b87ede66f6b7e376d1f46e13327077cd41719 (diff) | |
| download | openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.gz openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.bz2 openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.xz openshift-055921cd545c12733949f37c1af2c0a1296216ec.zip | |
Merge remote-tracking branch 'openshift/master'
Diffstat (limited to 'roles/openshift_node/templates')
| -rw-r--r-- | roles/openshift_node/templates/node.yaml.v1.j2 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2 index 7778a2a61..7b1c0f808 100644 --- a/roles/openshift_node/templates/node.yaml.v1.j2 +++ b/roles/openshift_node/templates/node.yaml.v1.j2 @@ -8,6 +8,9 @@ imageConfig: format: {{ openshift.node.registry_url }} latest: false kind: NodeConfig +{% if openshift.node.kubelet_args is defined and openshift.node.kubelet_args %} +kubeletArguments: {{ openshift.node.kubelet_args | to_json }} +{% endif %} masterKubeConfig: system:node:{{ openshift.common.hostname }}.kubeconfig networkPluginName: {{ openshift.common.sdn_network_plugin_name }} nodeName: {{ openshift.common.hostname }} |