summaryrefslogtreecommitdiffstats
path: root/DEPLOYMENT_TYPES.md
diff options
context:
space:
mode:
authorRodolfo Carvalho <rhcarvalho@gmail.com>2017-03-29 16:46:54 +0200
committerRodolfo Carvalho <rhcarvalho@gmail.com>2017-04-11 13:21:39 +0200
commit79456a702e201c32aa6709dd767c84e70945f451 (patch)
treedc93ea04b28381721029f79f82e6681cafcba80c /DEPLOYMENT_TYPES.md
parent61d1a8ccbe90373a4ae7f0e3e5ba7a98d0a87132 (diff)
downloadopenshift-79456a702e201c32aa6709dd767c84e70945f451.tar.gz
openshift-79456a702e201c32aa6709dd767c84e70945f451.tar.bz2
openshift-79456a702e201c32aa6709dd767c84e70945f451.tar.xz
openshift-79456a702e201c32aa6709dd767c84e70945f451.zip
Update deployment_type documentation
Diffstat (limited to 'DEPLOYMENT_TYPES.md')
-rw-r--r--DEPLOYMENT_TYPES.md32
1 files changed, 17 insertions, 15 deletions
diff --git a/DEPLOYMENT_TYPES.md b/DEPLOYMENT_TYPES.md
index 42ac5635a..3ad7f05b3 100644
--- a/DEPLOYMENT_TYPES.md
+++ b/DEPLOYMENT_TYPES.md
@@ -1,22 +1,24 @@
-#Deployment Types
+# Deployment Types
-This module supports OpenShift Origin and OpenShift Enterprise Each deployment
-type sets various defaults used throughout your environment.
+This repository supports OpenShift Origin and OpenShift Container Platform.
-The table below outlines the defaults per `deployment_type`.
+Various defaults used throughout the playbooks and roles in this repository are
+set based on the deployment type configuration (usually defined in an Ansible
+hosts file).
-| 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} | aos3/aos-${component}:${version} |
-| **Image Streams** | centos | rhel + xpaas | rhel |
+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 |
-**NOTE** `enterprise` deployment type is used for OpenShift Enterprise version
-3.0.x OpenShift Enterprise deployments utilizing version 3.1 and later will
-make use of the new `openshift-enterprise` deployment type. Additional work to
-migrate between the two will be forthcoming.
+**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.