diff options
author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-25 11:19:09 -0500 |
---|---|---|
committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-25 11:19:09 -0500 |
commit | 65b9391f661f463255e4f705a2c58fc54cc1cf5e (patch) | |
tree | 730417ec52f06cf24bca75502494c959e455f1d8 | |
parent | 625addec56337b940dd72ac187f3e9f3f652178e (diff) | |
parent | ad62a606342a0301fcba02ed1e3b3d7badaef236 (diff) | |
download | openshift-65b9391f661f463255e4f705a2c58fc54cc1cf5e.tar.gz openshift-65b9391f661f463255e4f705a2c58fc54cc1cf5e.tar.bz2 openshift-65b9391f661f463255e4f705a2c58fc54cc1cf5e.tar.xz openshift-65b9391f661f463255e4f705a2c58fc54cc1cf5e.zip |
Merge pull request #1447 from abutcher/byo-cidr-ports
Add byo examples for network cidr and api/console ports.
-rw-r--r-- | inventory/byo/hosts.aep.example | 14 | ||||
-rw-r--r-- | inventory/byo/hosts.origin.example | 14 | ||||
-rw-r--r-- | inventory/byo/hosts.ose.example | 14 |
3 files changed, 42 insertions, 0 deletions
diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example index 8cd4caac4..2bb50e97c 100644 --- a/inventory/byo/hosts.aep.example +++ b/inventory/byo/hosts.aep.example @@ -157,6 +157,20 @@ 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. +#osm_cluster_network_cidr=10.1.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 master API and console ports. +#openshift_master_api_port=8443 +#openshift_master_console_port=8443 + # set RPM version for debugging purposes #openshift_pkg_version=-3.1.0.0 diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index fffdcaab4..c529a46d5 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -162,6 +162,20 @@ 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. +#osm_cluster_network_cidr=10.1.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 master API and console ports. +#openshift_master_api_port=8443 +#openshift_master_console_port=8443 + # set RPM version for debugging purposes #openshift_pkg_version=-1.1 diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 233c1c8e2..a40082dcb 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -158,6 +158,20 @@ 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. +#osm_cluster_network_cidr=10.1.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 master API and console ports. +#openshift_master_api_port=8443 +#openshift_master_console_port=8443 + # set RPM version for debugging purposes #openshift_pkg_version=-3.1.0.0 |