summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-10-20 11:02:23 -0400
committerGitHub <noreply@github.com>2017-10-20 11:02:23 -0400
commit94a75431044d6124dcb22659cbecbb09c3cb3a38 (patch)
tree22f83883627f562e42e775f029a2415cafba60d9 /roles/openshift_master/templates
parent30d3fc6ed990c8e9f13b4e96e6e7acff13500e1e (diff)
parente6ea6839a8f657c1266c25ba4aba43c837329fa3 (diff)
downloadopenshift-94a75431044d6124dcb22659cbecbb09c3cb3a38.tar.gz
openshift-94a75431044d6124dcb22659cbecbb09c3cb3a38.tar.bz2
openshift-94a75431044d6124dcb22659cbecbb09c3cb3a38.tar.xz
openshift-94a75431044d6124dcb22659cbecbb09c3cb3a38.zip
Merge pull request #5574 from dulek/containerized_kuryr_support
Initial Kuryr support
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