summaryrefslogtreecommitdiffstats
path: root/utils/docs
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-23 16:18:24 -0400
committerGitHub <noreply@github.com>2016-08-23 16:18:24 -0400
commit57a794122c0e1a8cc3b4b5fe9613f8d3aaf7f760 (patch)
treefd7d9ca1c5554c63a14ef413f454f2552dfdc0d7 /utils/docs
parentaf01e6dd961541a1cb3a890cffd548e71a32f48b (diff)
parent2bb4266be4f3e30f4ab1b22354bbeb68f3432df7 (diff)
downloadopenshift-57a794122c0e1a8cc3b4b5fe9613f8d3aaf7f760.tar.gz
openshift-57a794122c0e1a8cc3b4b5fe9613f8d3aaf7f760.tar.bz2
openshift-57a794122c0e1a8cc3b4b5fe9613f8d3aaf7f760.tar.xz
openshift-57a794122c0e1a8cc3b4b5fe9613f8d3aaf7f760.zip
Merge pull request #2334 from smunilla/BZ1358951
Bug 1358951 - Error loading config, no such key: 'deployment' when using ing previously valid answers file
Diffstat (limited to 'utils/docs')
-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
-
-