diff options
| author | Scott Dodson <sdodson@redhat.com> | 2015-08-31 16:28:23 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2015-09-02 12:44:23 -0400 |
| commit | 32578c30f370d05dd472d07d07d7b934fd9c1510 (patch) | |
| tree | 079f70066a8232c141a6be921b938a3574237538 /roles/openshift_master/templates | |
| parent | a52fb4dee40155e76131927232940d77e2913568 (diff) | |
| download | openshift-32578c30f370d05dd472d07d07d7b934fd9c1510.tar.gz openshift-32578c30f370d05dd472d07d07d7b934fd9c1510.tar.bz2 openshift-32578c30f370d05dd472d07d07d7b934fd9c1510.tar.xz openshift-32578c30f370d05dd472d07d07d7b934fd9c1510.zip | |
Add serviceNetworkCIDR to network config
Required by OSE 3.0.2 and Origin 1.0.6
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 }} |