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_master/templates | |
| 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_master/templates')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 2 |
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 fff123d0d..7aa4ce9b6 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -88,6 +88,8 @@ networkConfig: clusterNetworkCIDR: {{ openshift.master.sdn_cluster_network_cidr }} hostSubnetLength: {{ openshift.master.sdn_host_subnet_length }} networkPluginName: {{ openshift.common.sdn_network_plugin_name }} +# serviceNetworkCIDR must match kubernetesMasterConfig.servicesSubnet + serviceNetworkCIDR: {{ openshift.master.portal_net }} {% include 'v1_partials/oauthConfig.j2' %} policyConfig: bootstrapPolicyFile: {{ openshift_master_policy }} |