diff options
| author | Matt Woodson <mwoodson@gmail.com> | 2016-01-18 15:08:03 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@gmail.com> | 2016-01-18 15:08:03 -0500 |
| commit | 3bed4d0c4bda1b6332ec547502663d09e98b89d1 (patch) | |
| tree | f64e0d0c7e9bc06a76d727050047053cf1a30a6a /roles/openshift_node/templates | |
| parent | 0bbfef4e1951db1f19135e532f78fe12cab6d4fc (diff) | |
| parent | ee3aec770b6b1a2b0212b432a920e3d846e56044 (diff) | |
| download | openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.tar.gz openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.tar.bz2 openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.tar.xz openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.zip | |
Merge pull request #1214 from openshift/master
Merge master into prod
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 }} |