Merge pull request #8202 from ahardin-rh/online-wildcard-routes

Bug 1557406, applied edits for Online & Dedicated doc sets

architecture/networking/routes.adoc

@@ -34,6 +34,13 @@ is running the router.
 Each route consists of a name (limited to 63 characters), a service selector,
 and an optional security configuration.
 
+ifdef::openshift-online,openshift-dedicated[]
+[NOTE]
+====
+Wildcard routes are disabled in {product-title}.
+====
+endif::[]
+
 [[routers]]
 include::architecture/topics/routers.adoc[]
 
@@ -675,6 +682,7 @@ metadata:
     haproxy.router.openshift.io/ip_whitelist: 180.5.61.153 192.168.1.0/24 10.0.0.0/8
 ----
 
+ifdef::openshift-enterprise,openshift-origin[]
 [[wildcard-subdomain-route-policy]]
 == Creating Routes Specifying a Wildcard Subdomain Policy
 
@@ -684,9 +692,8 @@ wildcard policy as part of its configuration using the `wildcardPolicy` field.
 Any routers run with a policy allowing wildcard routes will expose the route
 appropriately based on the wildcard policy.
 
-ifdef::openshift-enterprise,openshift-origin[]
 xref:../../install_config/router/default_haproxy_router.adoc#using-wildcard-routes[Learn how to configure HAProxy routers to allow wildcard routes].
-endif::[]
+
 
 .A Route Specifying a Subdomain WildcardPolicy
 ====
@@ -706,6 +713,7 @@ spec:
     in the subdomain `example.com`. `*.example.com` is the subdomain for host
     name `wildcard.example.com` to reach the exposed service.
 ====
+endif::[]
 
 [[route-status-field]]
 == Route Status
@@ -824,4 +832,4 @@ $ oc expose service/<name> --hostname="api.openshift.org"
 $ oc expose service/<name> --hostname="m.api.openshift.org"
 $ oc expose service/<name> --hostname="kates.net"
 $ oc expose service/<name> --hostname="api.kates.net"
-----
+----

architecture/topics/router_environment_variables.adoc

@@ -73,7 +73,9 @@ will "linger" around for that period. xref:time-units[(TimeUnits)]
 |`TEMPLATE_FILE` | `/var/lib/haproxy/conf/custom/` `haproxy-config-custom.template` | The path to the HAProxy template file (in the container image).
 |`RELOAD_INTERVAL` | 5s | The minimum frequency the router is allowed to reload to accept new changes. xref:time-units[(TimeUnits)]
 |`ROUTER_USE_PROXY_PROTOCOL`|  | When set to `true` or `TRUE`, HAProxy expects incoming connections to use the `PROXY` protocol on port 80 or port 443. The source IP address can pass through a load balancer if the load balancer supports the protocol, for example Amazon ELB.
+ifdef::openshift-enterprise,openshift-origin[]
 |`ROUTER_ALLOW_WILDCARD_ROUTES`|  |  When set to `true` or `TRUE`, any routes with a wildcard policy of `Subdomain` that pass the router admission checks will be serviced by the HAProxy router.
+endif::[]
 |`ROUTER_DISABLE_NAMESPACE_OWNERSHIP_CHECK` |  | Set to `true` to relax the namespace ownership policy.
 |`ROUTER_STRICT_SNI` |  | xref:strict-sni[strict-sni]
 |`ROUTER_CIPHERS` | intermediate  | Specify the set of xref:ciphers[ciphers] supported by bind.