summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2015-09-01 16:34:01 -0400
committerScott Dodson <sdodson@redhat.com>2015-09-02 12:44:34 -0400
commitc28aea2f19b6aea729f27b636e5318ac775addb6 (patch)
tree127d941412bdb2d201f5cb954b3b1f5411f92212 /roles/openshift_node
parent32578c30f370d05dd472d07d07d7b934fd9c1510 (diff)
downloadopenshift-c28aea2f19b6aea729f27b636e5318ac775addb6.tar.gz
openshift-c28aea2f19b6aea729f27b636e5318ac775addb6.tar.bz2
openshift-c28aea2f19b6aea729f27b636e5318ac775addb6.tar.xz
openshift-c28aea2f19b6aea729f27b636e5318ac775addb6.zip
Add openshift_node_sdn_mtu configuration
Sync's with Origin 1.0.6 and OSE 3.0.2 node-config.yaml networkConfig changes Fixes #534
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.j27
2 files changed, 7 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index db1731d65..e56a666e9 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -28,6 +28,7 @@
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) }}"
+ sdn_mtu: "{{ openshift_node_sdn_mtu | default(None) }}"
- name: Install Node package
yum: pkg={{ openshift.common.service_type }}-node state=present
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2
index e176e7511..0f708fb55 100644
--- a/roles/openshift_node/templates/node.yaml.v1.j2
+++ b/roles/openshift_node/templates/node.yaml.v1.j2
@@ -13,6 +13,11 @@ kubeletArguments: {{ openshift.node.kubelet_args | to_json }}
{% endif %}
masterKubeConfig: system:node:{{ openshift.common.hostname }}.kubeconfig
networkPluginName: {{ openshift.common.sdn_network_plugin_name }}
+# networkConfig struct introduced in origin 1.0.6 and OSE 3.0.2 which
+# deprecates networkPluginName above. The two should match.
+networkConfig:
+ mtu: {{ openshift.node.sdn_mtu }}
+ networkPluginName: {{ openshift.common.sdn_network_plugin_name }}
nodeName: {{ openshift.common.hostname }}
podManifestConfig:
servingInfo:
@@ -21,4 +26,4 @@ servingInfo:
clientCA: ca.crt
keyFile: server.key
volumeDirectory: {{ openshift_data_dir }}/openshift.local.volumes
-{% include 'partials/kubeletArguments.j2' %} \ No newline at end of file
+{% include 'partials/kubeletArguments.j2' %}