summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-11-17 10:57:37 -0800
committerGitHub <noreply@github.com>2017-11-17 10:57:37 -0800
commit69440cf70ca83374d20c174aec01684916822323 (patch)
treef059d4b844f2b5c84812d48ce6ae8747c0bf63d0
parentf242edce899d5bd8a1bb6dcd758fdb3bbeb111a0 (diff)
parent39b80f044a8e063ece4cb38d7c8bd5f92d21e8f0 (diff)
downloadopenshift-69440cf70ca83374d20c174aec01684916822323.tar.gz
openshift-69440cf70ca83374d20c174aec01684916822323.tar.bz2
openshift-69440cf70ca83374d20c174aec01684916822323.tar.xz
openshift-69440cf70ca83374d20c174aec01684916822323.zip
Merge pull request #6167 from kwoodson/mtu_int_value
Automatic merge from submit-queue. Updating mtu value to int
-rw-r--r--roles/openshift_node_group/defaults/main.yml2
-rw-r--r--roles/openshift_node_group/templates/node-config.yaml.j22
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_node_group/defaults/main.yml b/roles/openshift_node_group/defaults/main.yml
index d398a7fdc..7c81409a5 100644
--- a/roles/openshift_node_group/defaults/main.yml
+++ b/roles/openshift_node_group/defaults/main.yml
@@ -23,4 +23,4 @@ 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) }}"
+openshift_node_group_network_mtu: "{{ openshift_node_sdn_mtu | default(8951) | int }}"
diff --git a/roles/openshift_node_group/templates/node-config.yaml.j2 b/roles/openshift_node_group/templates/node-config.yaml.j2
index 5e22dc6d2..3fd16247c 100644
--- a/roles/openshift_node_group/templates/node-config.yaml.j2
+++ b/roles/openshift_node_group/templates/node-config.yaml.j2
@@ -33,7 +33,7 @@ masterClientConnectionOverrides:
qps: 20
masterKubeConfig: node.kubeconfig
networkConfig:
- mtu: "{{ openshift_node_group_network_mtu }}"
+ mtu: {{ openshift_node_group_network_mtu }}
networkPluginName: {{ openshift_node_group_network_plugin }}
nodeIP: ""
podManifestConfig: null