diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-09-02 16:55:17 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-09-02 16:55:17 -0400 |
| commit | 7d480fbab74ddc8f76279f32c1a64148e5844382 (patch) | |
| tree | b9dcfc1a501b3e11a5ad1a64156eb5ee0f426c9b /roles/openshift_node | |
| parent | 795a1d2c6a34d1ca3eb8e84325d9109d134e0a33 (diff) | |
| parent | c28aea2f19b6aea729f27b636e5318ac775addb6 (diff) | |
| download | openshift-7d480fbab74ddc8f76279f32c1a64148e5844382.tar.gz openshift-7d480fbab74ddc8f76279f32c1a64148e5844382.tar.bz2 openshift-7d480fbab74ddc8f76279f32c1a64148e5844382.tar.xz openshift-7d480fbab74ddc8f76279f32c1a64148e5844382.zip | |
Merge pull request #544 from sdodson/serviceNetworkCIDR
Add serviceNetworkCIDR and SDN MTU config
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_node/templates/node.yaml.v1.j2 | 7 |
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' %} |