diff options
| author | Samuel Munilla <smunilla@redhat.com> | 2016-10-24 13:26:56 -0400 |
|---|---|---|
| committer | Samuel Munilla <smunilla@redhat.com> | 2016-11-03 16:19:11 -0400 |
| commit | b50b4ea0b03feb9431abd7294fe4fb6b549ddfc0 (patch) | |
| tree | 3e191cc9e3d09c368f75fe01bf0a3ac1f51ce949 /inventory | |
| parent | 17c3d6236adea676c3d9248c3d2f7afb0d582750 (diff) | |
| download | openshift-b50b4ea0b03feb9431abd7294fe4fb6b549ddfc0.tar.gz openshift-b50b4ea0b03feb9431abd7294fe4fb6b549ddfc0.tar.bz2 openshift-b50b4ea0b03feb9431abd7294fe4fb6b549ddfc0.tar.xz openshift-b50b4ea0b03feb9431abd7294fe4fb6b549ddfc0.zip | |
Update defaults for clusterNetworkCIDR & hostSubnetLength
Per https://github.com/openshift/openshift-docs/issues/1700:
The default values for pod networking have changed:
- clusterNetworkCIDR now defaults to 10.128.0.0/14 (10.128.0.0 - 10.131.255.255)
rather than 10.1.0.0/16.
- hostSubnetLength now defaults to 9 rather than 8
(meaning each node will be assigned a /23 subnet rather than a /24)
Fixes Bug 1320952
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/byo/hosts.origin.example | 8 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 13f4c214c..e769537f9 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -472,7 +472,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # network blocks should be private and should not conflict with network blocks # in your infrastructure that pods may require access to. Can not be changed # after deployment. -#osm_cluster_network_cidr=10.1.0.0/16 +#osm_cluster_network_cidr=10.128.0.0/14 #openshift_portal_net=172.30.0.0/16 @@ -492,9 +492,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # the CIDRs reserved for external IPs, nodes, pods, or services. #openshift_master_ingress_ip_network_cidr=172.46.0.0/16 -# Configure number of bits to allocate to each host’s subnet e.g. 8 -# would mean a /24 network on the host. -#osm_host_subnet_length=8 +# Configure number of bits to allocate to each host’s subnet e.g. 9 +# would mean a /23 network on the host. +#osm_host_subnet_length=9 # Configure master API and console ports. #openshift_master_api_port=8443 diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 2d54dfceb..be919c105 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -472,7 +472,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # network blocks should be private and should not conflict with network blocks # in your infrastructure that pods may require access to. Can not be changed # after deployment. -#osm_cluster_network_cidr=10.1.0.0/16 +#osm_cluster_network_cidr=10.128.0.0/14 #openshift_portal_net=172.30.0.0/16 @@ -492,9 +492,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # the CIDRs reserved for external IPs, nodes, pods, or services. #openshift_master_ingress_ip_network_cidr=172.46.0.0/16 -# Configure number of bits to allocate to each host’s subnet e.g. 8 -# would mean a /24 network on the host. -#osm_host_subnet_length=8 +# Configure number of bits to allocate to each host’s subnet e.g. 9 +# would mean a /23 network on the host. +#osm_host_subnet_length=9 # Configure master API and console ports. #openshift_master_api_port=8443 |