summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorTomas Sedovic <tomas@sedovic.cz>2015-10-06 11:10:55 +0200
committerTomas Sedovic <tomas@sedovic.cz>2015-10-20 08:29:23 +0200
commit2b465af8ecc2ab2da13d60707e3383f809ea9924 (patch)
tree24e810676e6a65b2c7bf1a3f4e8425ff51d724e0 /roles/openshift_node
parentebbf308703f3061f7c57fedf281e610b4ea4fdf4 (diff)
downloadopenshift-2b465af8ecc2ab2da13d60707e3383f809ea9924.tar.gz
openshift-2b465af8ecc2ab2da13d60707e3383f809ea9924.tar.bz2
openshift-2b465af8ecc2ab2da13d60707e3383f809ea9924.tar.xz
openshift-2b465af8ecc2ab2da13d60707e3383f809ea9924.zip
Allow disabling the network plugin configuration
This is useful when we want to use a different networking solution without having any networking plugin code run when the services start up.
Diffstat (limited to 'roles/openshift_node')
-rw-r--r--roles/openshift_node/templates/node.yaml.v1.j24
1 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2
index 946c0b655..4931d127e 100644
--- a/roles/openshift_node/templates/node.yaml.v1.j2
+++ b/roles/openshift_node/templates/node.yaml.v1.j2
@@ -12,12 +12,16 @@ kind: NodeConfig
kubeletArguments: {{ openshift.node.kubelet_args | to_json }}
{% endif %}
masterKubeConfig: system:node:{{ openshift.common.hostname }}.kubeconfig
+{% if openshift.common.use_openshift_sdn %}
networkPluginName: {{ openshift.common.sdn_network_plugin_name }}
+{% endif %}
# 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 }}
+{% if openshift.common.use_openshift_sdn %}
networkPluginName: {{ openshift.common.sdn_network_plugin_name }}
+{% endif %}
nodeName: {{ openshift.common.hostname | lower }}
podManifestConfig:
servingInfo: