diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-07 16:02:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-07 16:02:49 -0500 |
| commit | f5f7937a89deceae5795987d2eeae26810499b99 (patch) | |
| tree | 8122968040ebe5addd66fd4e4520e10dc56fa623 /inventory | |
| parent | 24b351d565835fbc287007c37dbf8ee9d94d8398 (diff) | |
| parent | b50b4ea0b03feb9431abd7294fe4fb6b549ddfc0 (diff) | |
| download | openshift-f5f7937a89deceae5795987d2eeae26810499b99.tar.gz openshift-f5f7937a89deceae5795987d2eeae26810499b99.tar.bz2 openshift-f5f7937a89deceae5795987d2eeae26810499b99.tar.xz openshift-f5f7937a89deceae5795987d2eeae26810499b99.zip | |
Merge pull request #2652 from smunilla/BZ1320952_default_for_clusterNetworkCIDR
Update defaults for clusterNetworkCIDR & hostSubnetLength
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 |