Skip to content

Commit

Permalink
Remove references to outdated deployment_type
Browse files Browse the repository at this point in the history
'enterprise' is not used anymore (since 3.1) and thus can be safely
omitted for avoiding confusion.
  • Loading branch information
rhcarvalho committed Apr 11, 2017
1 parent 79456a7 commit 5373cc0
Showing 1 changed file with 7 additions and 14 deletions.
21 changes: 7 additions & 14 deletions DEPLOYMENT_TYPES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |

0 comments on commit 5373cc0

Please sign in to comment.