diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-04-12 09:50:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-12 09:50:13 -0400 |
| commit | ff88247e7c3818c86a2c65ba0573e874b0998987 (patch) | |
| tree | 467477b53b97c4a75c650fcd3ae5b43827d1a139 /DEPLOYMENT_TYPES.md | |
| parent | 8d34cd374e9798e747ea02b0657571e717f25e76 (diff) | |
| parent | 69fb4f0e741b09d21f14a4533193b0aa05df1b10 (diff) | |
| download | openshift-ff88247e7c3818c86a2c65ba0573e874b0998987.tar.gz openshift-ff88247e7c3818c86a2c65ba0573e874b0998987.tar.bz2 openshift-ff88247e7c3818c86a2c65ba0573e874b0998987.tar.xz openshift-ff88247e7c3818c86a2c65ba0573e874b0998987.zip | |
Merge pull request #3799 from rhcarvalho/docs
Documentation updates
Diffstat (limited to 'DEPLOYMENT_TYPES.md')
| -rw-r--r-- | DEPLOYMENT_TYPES.md | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/DEPLOYMENT_TYPES.md b/DEPLOYMENT_TYPES.md index 42ac5635a..009a1d95c 100644 --- a/DEPLOYMENT_TYPES.md +++ b/DEPLOYMENT_TYPES.md @@ -1,22 +1,17 @@ -#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`. - -| 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 -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. +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). +The table below outlines the defaults per `openshift_deployment_type`: +| openshift_deployment_type | origin | openshift-enterprise | +|-----------------------------------------------------------------|------------------------------------------|----------------------------------------| +| **openshift.common.service_type** (also used for package names) | origin | atomic-openshift | +| **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 | |