summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-11-01 15:09:09 -0700
committerGitHub <noreply@github.com>2017-11-01 15:09:09 -0700
commitb74b78f37e01e1837843f236b51d3676174afdef (patch)
tree5a2f00c812eff4a71b0f4d99ed2dc76e6df5964c
parentcb27e144520c4cd108189aaf38d95deaa8a6fa6c (diff)
parent20a18243efcf59e91dbe3f40cac1306cbfd0e89f (diff)
downloadopenshift-b74b78f37e01e1837843f236b51d3676174afdef.tar.gz
openshift-b74b78f37e01e1837843f236b51d3676174afdef.tar.bz2
openshift-b74b78f37e01e1837843f236b51d3676174afdef.tar.xz
openshift-b74b78f37e01e1837843f236b51d3676174afdef.zip
Merge pull request #5972 from smarterclayton/default_mtu
Automatic merge from submit-queue. MTU for bootstrapping should default to openshift_node_sdn_mtu The default value needs to be consistently used. @kwoodson
-rw-r--r--roles/openshift_master/defaults/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml
index dafafda08..fe78dea66 100644
--- a/roles/openshift_master/defaults/main.yml
+++ b/roles/openshift_master/defaults/main.yml
@@ -64,7 +64,7 @@ openshift_master_config_dir_default: "{{ (openshift.common.config_base | default
openshift_master_config_dir: "{{ openshift_master_config_dir_default }}"
openshift_master_cloud_provider: "{{ openshift_cloudprovider_kind | default('aws') }}"
-openshift_master_node_config_networkconfig_mtu: 1450
+openshift_master_node_config_networkconfig_mtu: "{{ openshift_node_sdn_mtu | default(1450) }}"
openshift_master_node_config_kubeletargs_cpu: 500m
openshift_master_node_config_kubeletargs_mem: 512M
@@ -103,7 +103,7 @@ openshift_master_node_config_default_edits:
value:
- 'true'
- key: networkConfig.mtu
- value: 8951
+ value: "{{ openshift_master_node_config_networkconfig_mtu }}"
- key: networkConfig.networkPluginName
value: "{{ r_openshift_master_sdn_network_plugin_name }}"
- key: networkPluginName