summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates
diff options
context:
space:
mode:
authorMichał Dulko <mdulko@redhat.com>2017-04-05 14:24:24 +0200
committerMichał Dulko <mdulko@redhat.com>2017-10-20 14:22:52 +0200
commite6ea6839a8f657c1266c25ba4aba43c837329fa3 (patch)
treeabe66b2a635679b74b54f618c5b15e8ed793c6d1 /roles/openshift_master/templates
parent36d6b8ab6ee42a8a98321ae371398cf520ae8b71 (diff)
downloadopenshift-e6ea6839a8f657c1266c25ba4aba43c837329fa3.tar.gz
openshift-e6ea6839a8f657c1266c25ba4aba43c837329fa3.tar.bz2
openshift-e6ea6839a8f657c1266c25ba4aba43c837329fa3.tar.xz
openshift-e6ea6839a8f657c1266c25ba4aba43c837329fa3.zip
Initial Kuryr support
This commit enables deploying Kuryr networking on top of OpenShift in containers. kuryr-controller is a Deployment and kuryr-cni is deployed as DaemonSet (container will drop all CNI configuration files). Co-Authored-By: Antoni Segura Puimedon <celebdor@gmail.com>
Diffstat (limited to 'roles/openshift_master/templates')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 7159ccc7f..40775571f 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -179,7 +179,7 @@ masterPublicURL: {{ openshift.master.public_api_url }}
networkConfig:
clusterNetworkCIDR: {{ openshift.master.sdn_cluster_network_cidr }}
hostSubnetLength: {{ openshift.master.sdn_host_subnet_length }}
-{% if r_openshift_master_use_openshift_sdn or r_openshift_master_use_nuage or r_openshift_master_use_contiv or r_openshift_master_sdn_network_plugin_name == 'cni' %}
+{% if r_openshift_master_use_openshift_sdn or r_openshift_master_use_nuage or r_openshift_master_use_contiv or r_openshift_master_use_kuryr or r_openshift_master_sdn_network_plugin_name == 'cni' %}
networkPluginName: {{ r_openshift_master_sdn_network_plugin_name_default }}
{% endif %}
# serviceNetworkCIDR must match kubernetesMasterConfig.servicesSubnet