Browse Source

Merge pull request #8046 from mtnbikenc/fix-1568017

Correct default sdn_mtu setting
Scott Dodson 7 years ago
parent
commit
45694e74a7

+ 0 - 1
roles/openshift_node_group/defaults/main.yml

@@ -28,7 +28,6 @@ openshift_node_group_network_plugin_default: "{{ os_sdn_network_plugin_name | de
 openshift_node_group_network_plugin: "{{ openshift_node_group_network_plugin_default }}"
 openshift_node_group_node_data_dir_default: "{{ openshift_data_dir | default('/var/lib/origin') }}"
 openshift_node_group_node_data_dir: "{{ openshift_node_group_node_data_dir_default }}"
-openshift_node_group_network_mtu: "{{ openshift_node_sdn_mtu | default(8951) | int }}"
 
 l_openshift_images_dict:
   origin: 'docker.io/openshift/origin-${component}:${version}'

+ 1 - 1
roles/openshift_node_group/templates/node-config.yaml.j2

@@ -57,7 +57,7 @@ masterClientConnectionOverrides:
   qps: 20
 masterKubeConfig: node.kubeconfig
 networkConfig:
-  mtu: {{ openshift_node_group_network_mtu }}
+  mtu: {{ openshift.node.sdn_mtu }}
   networkPluginName: {{ openshift_node_group_network_plugin }}
 servingInfo:
   bindAddress: 0.0.0.0:10250