diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-05-01 15:05:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-01 15:05:15 -0400 |
| commit | 6ef6d1d85716ae8e3e850af0fc5b516e05179411 (patch) | |
| tree | 3ba6485033cfb8627bb6b4ace6d26c48ca009ddc | |
| parent | 94aae1e4a3c177190eb818e416515bbe559bdb8f (diff) | |
| parent | ec832e4ee6fa5ce31cefb7e380171615c0c7f4c1 (diff) | |
| download | openshift-6ef6d1d85716ae8e3e850af0fc5b516e05179411.tar.gz openshift-6ef6d1d85716ae8e3e850af0fc5b516e05179411.tar.bz2 openshift-6ef6d1d85716ae8e3e850af0fc5b516e05179411.tar.xz openshift-6ef6d1d85716ae8e3e850af0fc5b516e05179411.zip | |
Merge pull request #3972 from lpsantil/master
Update byo hosts examples with stronger warnings about Docker subnet overlap
| -rw-r--r-- | inventory/byo/hosts.origin.example | 9 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index f70971537..d31c35f69 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -571,10 +571,17 @@ 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. +# +# WARNING : Do not pick subnets that overlap with the default Docker bridge subnet of +# 172.17.0.0/16. Your installation will fail and/or your configuration change will +# cause the Pod SDN or Cluster SDN to fail. +# +# WORKAROUND : If you must use an overlapping subnet, you can configure a non conflicting +# docker0 CIDR range by adding '--bip=192.168.2.1/24' to DOCKER_NETWORK_OPTIONS +# environment variable located in /etc/sysconfig/docker-network. #osm_cluster_network_cidr=10.128.0.0/14 #openshift_portal_net=172.30.0.0/16 - # ExternalIPNetworkCIDRs controls what values are acceptable for the # service external IP field. If empty, no externalIP may be set. It # may contain a list of CIDRs which are checked for access. If a CIDR diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index f5e0de1b0..80cc65f06 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -572,10 +572,17 @@ 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. +# +# WARNING : Do not pick subnets that overlap with the default Docker bridge subnet of +# 172.17.0.0/16. Your installation will fail and/or your configuration change will +# cause the Pod SDN or Cluster SDN to fail. +# +# WORKAROUND : If you must use an overlapping subnet, you can configure a non conflicting +# docker0 CIDR range by adding '--bip=192.168.2.1/24' to DOCKER_NETWORK_OPTIONS +# environment variable located in /etc/sysconfig/docker-network. #osm_cluster_network_cidr=10.128.0.0/14 #openshift_portal_net=172.30.0.0/16 - # ExternalIPNetworkCIDRs controls what values are acceptable for the # service external IP field. If empty, no externalIP may be set. It # may contain a list of CIDRs which are checked for access. If a CIDR |