summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates
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_master/templates
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_master/templates')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 500690523..cc1dee13d 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -87,7 +87,9 @@ masterPublicURL: {{ openshift.master.public_api_url }}
networkConfig:
clusterNetworkCIDR: {{ openshift.master.sdn_cluster_network_cidr }}
hostSubnetLength: {{ openshift.master.sdn_host_subnet_length }}
+ {% if openshift.common.use_openshift_sdn %}
networkPluginName: {{ openshift.common.sdn_network_plugin_name }}
+ {% endif %}
# serviceNetworkCIDR must match kubernetesMasterConfig.servicesSubnet
serviceNetworkCIDR: {{ openshift.master.portal_net }}
{% include 'v1_partials/oauthConfig.j2' %}