diff options
| author | Rodolfo Carvalho <rhcarvalho@gmail.com> | 2017-04-11 13:16:18 +0200 |
|---|---|---|
| committer | Rodolfo Carvalho <rhcarvalho@gmail.com> | 2017-04-11 13:21:39 +0200 |
| commit | 5373cc05c96e6faa440068ce2b3b222831623112 (patch) | |
| tree | 5a29118041a0610fd24f9c14c55cbe3f1857e60f | |
| parent | 79456a702e201c32aa6709dd767c84e70945f451 (diff) | |
| download | openshift-5373cc05c96e6faa440068ce2b3b222831623112.tar.gz openshift-5373cc05c96e6faa440068ce2b3b222831623112.tar.bz2 openshift-5373cc05c96e6faa440068ce2b3b222831623112.tar.xz openshift-5373cc05c96e6faa440068ce2b3b222831623112.zip | |
Remove references to outdated deployment_type
'enterprise' is not used anymore (since 3.1) and thus can be safely
omitted for avoiding confusion.
| -rw-r--r-- | DEPLOYMENT_TYPES.md | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/DEPLOYMENT_TYPES.md b/DEPLOYMENT_TYPES.md index 3ad7f05b3..417f8b6ab 100644 --- a/DEPLOYMENT_TYPES.md +++ b/DEPLOYMENT_TYPES.md @@ -8,17 +8,10 @@ hosts file). The table below outlines the defaults per `openshift_deployment_type`: -| openshift_deployment_type | origin | enterprise (< 3.1) | openshift-enterprise (>= 3.1) | -|-----------------------------------------------------------------|------------------------------------------|----------------------------------------|----------------------------------------| -| **openshift.common.service_type** (also used for package names) | origin | openshift | | -| **openshift.common.config_base** | /etc/origin | /etc/openshift | /etc/origin | -| **openshift.common.data_dir** | /var/lib/origin | /var/lib/openshift | /var/lib/origin | -| **openshift.master.registry_url openshift.node.registry_url** | openshift/origin-${component}:${version} | openshift3/ose-${component}:${version} | openshift3/ose-${component}:${version} | -| **Image Streams** | centos | rhel + xpaas | rhel | - - -**NOTES**: - -- `enterprise` deployment type is used for OpenShift Enterprise version -3.0.x. -- `openshift-enterprise` deployment type is used for OpenShift Enterprise (and now OpenShift Container Platform) version 3.1 and later. +| openshift_deployment_type | origin | openshift-enterprise | +|-----------------------------------------------------------------|------------------------------------------|----------------------------------------| +| **openshift.common.service_type** (also used for package names) | origin | | +| **openshift.common.config_base** | /etc/origin | /etc/origin | +| **openshift.common.data_dir** | /var/lib/origin | /var/lib/origin | +| **openshift.master.registry_url openshift.node.registry_url** | openshift/origin-${component}:${version} | openshift3/ose-${component}:${version} | +| **Image Streams** | centos | rhel | |