summaryrefslogtreecommitdiffstats
path: root/utils/docs/config.md
diff options
context:
space:
mode:
authorSamuel Munilla <smunilla@redhat.com>2016-08-19 15:51:13 -0400
committerSamuel Munilla <smunilla@redhat.com>2016-08-19 16:08:19 -0400
commit2bb4266be4f3e30f4ab1b22354bbeb68f3432df7 (patch)
tree29c9172455dd48c1c5403e90d6b8e438e93083c9 /utils/docs/config.md
parentc38bd418e0940deb5fb3f57583d1e6d0019962cf (diff)
downloadopenshift-2bb4266be4f3e30f4ab1b22354bbeb68f3432df7.tar.gz
openshift-2bb4266be4f3e30f4ab1b22354bbeb68f3432df7.tar.bz2
openshift-2bb4266be4f3e30f4ab1b22354bbeb68f3432df7.tar.xz
openshift-2bb4266be4f3e30f4ab1b22354bbeb68f3432df7.zip
a-o-i: Remove Legacy Config Upgrade
Remove the automatic upgrade of the 3.0 configuration file format and add some better error messaging that points the user at the docs.
Diffstat (limited to 'utils/docs/config.md')
-rw-r--r--utils/docs/config.md57
1 files changed, 31 insertions, 26 deletions
diff --git a/utils/docs/config.md b/utils/docs/config.md
index 2729f8d37..3677ffe2e 100644
--- a/utils/docs/config.md
+++ b/utils/docs/config.md
@@ -7,31 +7,38 @@ The default location this config file will be written to ~/.config/openshift/ins
## Example
```
-version: v1
+version: v2
variant: openshift-enterprise
-variant_version: 3.0
-ansible_ssh_user: root
-hosts:
-- ip: 10.0.0.1
- hostname: master-private.example.com
- public_ip: 24.222.0.1
- public_hostname: master.example.com
- master: true
- node: true
- containerized: true
- connect_to: 24.222.0.1
-- ip: 10.0.0.2
- hostname: node1-private.example.com
- public_ip: 24.222.0.2
- public_hostname: node1.example.com
- node: true
- connect_to: 10.0.0.2
-- ip: 10.0.0.3
- hostname: node2-private.example.com
- public_ip: 24.222.0.3
- public_hostname: node2.example.com
- node: true
- connect_to: 10.0.0.3
+variant_version: 3.3
+deployment:
+ ansible_ssh_user: root
+ hosts:
+ - connect_to: 24.222.0.1
+ ip: 10.0.0.1
+ hostname: master-private.example.com
+ public_ip: 24.222.0.1
+ public_hostname: master.example.com
+ roles:
+ - master
+ - node
+ containerized: true
+ - connect_to: 10.0.0.2
+ ip: 10.0.0.2
+ hostname: node1-private.example.com
+ public_ip: 24.222.0.2
+ public_hostname: node1.example.com
+ roles:
+ - node
+ - connect_to: 10.0.0.3
+ ip: 10.0.0.3
+ hostname: node2-private.example.com
+ public_ip: 24.222.0.3
+ public_hostname: node2.example.com
+ roles:
+ - node
+ roles:
+ master:
+ node:
```
## Primary Settings
@@ -76,5 +83,3 @@ Defines the user ansible will use to ssh to remote systems for gathering facts a
### ansible_log_path
Default: /tmp/ansible.log
-
-