diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-27 10:24:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-27 10:24:40 -0400 |
| commit | de664ef0826c816b5e9dd7bee835d05a1724a42e (patch) | |
| tree | dfac70f82e70978c2f17e186a0282481d349ad06 | |
| parent | e84779c512416ca0dff013a3ddad2931f21cf9a4 (diff) | |
| parent | a9c6c1f57000a173f9ec6fd2d2f071b618170ffd (diff) | |
| download | openshift-de664ef0826c816b5e9dd7bee835d05a1724a42e.tar.gz openshift-de664ef0826c816b5e9dd7bee835d05a1724a42e.tar.bz2 openshift-de664ef0826c816b5e9dd7bee835d05a1724a42e.tar.xz openshift-de664ef0826c816b5e9dd7bee835d05a1724a42e.zip | |
Merge pull request #2219 from sdodson/portal_net
Document openshift_portal_net
| -rw-r--r-- | inventory/byo/hosts.aep.example | 9 | ||||
| -rw-r--r-- | inventory/byo/hosts.origin.example | 10 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 10 |
3 files changed, 17 insertions, 12 deletions
diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example index 79add680a..8d2d95f8f 100644 --- a/inventory/byo/hosts.aep.example +++ b/inventory/byo/hosts.aep.example @@ -323,11 +323,12 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Disable the OpenShift SDN plugin # openshift_use_openshift_sdn=False -# Configure SDN cluster network CIDR block. This network block should -# be a private block and should not conflict with existing network -# blocks in your infrastructure that pods may require access to. -# Can not be changed after deployment. +# Configure SDN cluster network and kubernetes service CIDR blocks. These +# 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 +#openshift_portal_net=172.30.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. diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index dfe616519..d71ed5727 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -330,11 +330,13 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Disable the OpenShift SDN plugin # openshift_use_openshift_sdn=False -# Configure SDN cluster network CIDR block. This network block should -# be a private block and should not conflict with existing network -# blocks in your infrastructure that pods may require access to. -# Can not be changed after deployment. +# Configure SDN cluster network and kubernetes service CIDR blocks. These +# 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 +#openshift_portal_net=172.30.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. diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 9bce9b1e3..ccff97b47 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -324,11 +324,13 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Disable the OpenShift SDN plugin # openshift_use_openshift_sdn=False -# Configure SDN cluster network CIDR block. This network block should -# be a private block and should not conflict with existing network -# blocks in your infrastructure that pods may require access to. -# Can not be changed after deployment. +# Configure SDN cluster network and kubernetes service CIDR blocks. These +# 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 +#openshift_portal_net=172.30.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. |