summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-08-12 22:01:06 -0400
committerJason DeTiberus <jdetiber@redhat.com>2015-08-13 13:47:54 -0400
commit800256e451b112d3cd7c2356615572c0de3c3840 (patch)
treec75e72a5f5c35fc23ad90a23420699efa833ef85 /roles/openshift_node
parent1399425c70052445cc8659fd12cd19535fb95e5a (diff)
downloadopenshift-800256e451b112d3cd7c2356615572c0de3c3840.tar.gz
openshift-800256e451b112d3cd7c2356615572c0de3c3840.tar.bz2
openshift-800256e451b112d3cd7c2356615572c0de3c3840.tar.xz
openshift-800256e451b112d3cd7c2356615572c0de3c3840.zip
Add support for setting kubeletArguments, controllerArguments, and apiServerArguments
Diffstat (limited to 'roles/openshift_node')
-rw-r--r--roles/openshift_node/tasks/main.yml1
-rw-r--r--roles/openshift_node/templates/node.yaml.v1.j23
2 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index e84e74b40..3225645a2 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -33,6 +33,7 @@
registry_url: "{{ oreg_url | default(none) }}"
debug_level: "{{ openshift_node_debug_level | default(openshift.common.debug_level) }}"
portal_net: "{{ openshift_master_portal_net | default(None) }}"
+ kubelet_args: "{{ openshift_node_kubelet_args | default(None) }}"
# TODO: add the validate parameter when there is a validation command to run
- name: Create the Node config
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2
index 7778a2a61..e6f75a4c0 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.common.kubelet_args is defined and openshift.common.kubelet_args %}
+kubeletArguments: {{ kubelet_args }}
+{% endif %}
masterKubeConfig: system:node:{{ openshift.common.hostname }}.kubeconfig
networkPluginName: {{ openshift.common.sdn_network_plugin_name }}
nodeName: {{ openshift.common.hostname }}