diff options
author | Lutz Lange <llange@redhat.com> | 2016-01-12 09:09:31 +0000 |
---|---|---|
committer | Lutz Lange <llange@redhat.com> | 2016-01-12 09:09:31 +0000 |
commit | 4725d3509e1315ad671a77d355c7a5328578390b (patch) | |
tree | cc19f288786204e160756440f94bc45d678cf563 /roles/openshift_node/templates | |
parent | 25b2f5acaf140c386aff1c860b706778eba251a6 (diff) | |
download | openshift-4725d3509e1315ad671a77d355c7a5328578390b.tar.gz openshift-4725d3509e1315ad671a77d355c7a5328578390b.tar.bz2 openshift-4725d3509e1315ad671a77d355c7a5328578390b.tar.xz openshift-4725d3509e1315ad671a77d355c7a5328578390b.zip |
- sqashed to one commit
Diffstat (limited to 'roles/openshift_node/templates')
-rw-r--r-- | roles/openshift_node/templates/node.yaml.v1.j2 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2 index 23bd81f91..cbe811f83 100644 --- a/roles/openshift_node/templates/node.yaml.v1.j2 +++ b/roles/openshift_node/templates/node.yaml.v1.j2 @@ -11,9 +11,7 @@ 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 %} +kubeletArguments: {{ openshift.node.kubelet_args | default(None) | to_padded_yaml(level=1) }} masterKubeConfig: system:node:{{ openshift.common.hostname }}.kubeconfig {% if openshift.common.use_openshift_sdn %} networkPluginName: {{ openshift.common.sdn_network_plugin_name }} |