diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-04-04 11:52:56 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-04 11:52:56 -0500 |
commit | 5cc5815bcf20165525ae283569a5c77eee25180e (patch) | |
tree | 6b6f5330a2801a7032655fdfb781550f5161084d /DEPLOYMENT_TYPES.md | |
parent | 8503cd10fd1002f40667d5303b159ed321b5fb7a (diff) | |
parent | 1664a447b184b33ff0da4f07501dd706fea9e450 (diff) | |
download | openshift-5cc5815bcf20165525ae283569a5c77eee25180e.tar.gz openshift-5cc5815bcf20165525ae283569a5c77eee25180e.tar.bz2 openshift-5cc5815bcf20165525ae283569a5c77eee25180e.tar.xz openshift-5cc5815bcf20165525ae283569a5c77eee25180e.zip |
Merge pull request #3639 from ashcrow/otdebug
Merged by openshift-bot
Diffstat (limited to 'DEPLOYMENT_TYPES.md')
-rw-r--r-- | DEPLOYMENT_TYPES.md | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/DEPLOYMENT_TYPES.md b/DEPLOYMENT_TYPES.md index 668d14fc0..42ac5635a 100644 --- a/DEPLOYMENT_TYPES.md +++ b/DEPLOYMENT_TYPES.md @@ -1,18 +1,17 @@ #Deployment Types -This module supports OpenShift Origin, OpenShift Enterprise, and Atomic -Enterprise Platform. Each deployment type sets various defaults used throughout -your environment. +This module supports OpenShift Origin and OpenShift Enterprise Each deployment +type sets various defaults used throughout your environment. The table below outlines the defaults per `deployment_type`. -| deployment_type | origin | enterprise (< 3.1) | atomic-enterprise | openshift-enterprise (>= 3.1) | -|-----------------------------------------------------------------|------------------------------------------|----------------------------------------|----------------------------------|----------------------------------| -| **openshift.common.service_type** (also used for package names) | origin | openshift | atomic-openshift | | -| **openshift.common.config_base** | /etc/origin | /etc/openshift | /etc/origin | /etc/origin | -| **openshift.common.data_dir** | /var/lib/origin | /var/lib/openshift | /var/lib/origin | /var/lib/origin | -| **openshift.master.registry_url openshift.node.registry_url** | openshift/origin-${component}:${version} | openshift3/ose-${component}:${version} | aos3/aos-${component}:${version} | aos3/aos-${component}:${version} | -| **Image Streams** | centos | rhel + xpaas | N/A | rhel | +| 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 | **NOTE** `enterprise` deployment type is used for OpenShift Enterprise version |