diff options
| author | Thomas Wiest <twiest@redhat.com> | 2015-12-09 15:48:15 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@redhat.com> | 2015-12-09 15:48:15 -0500 |
| commit | 14c69ad397be8ee101ef5b4edfa223d703e67ad0 (patch) | |
| tree | 70eee046db8012061c178ab4e686650048265564 /README_openstack.md | |
| parent | 898290cb3aabbc9d98883181877ac857a2fe1faf (diff) | |
| parent | b7b3e6dbdfd17e55055630ce963965818e830620 (diff) | |
| download | openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.tar.gz openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.tar.bz2 openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.tar.xz openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.zip | |
Merge remote-tracking branch 'upstream/master' into prod
Diffstat (limited to 'README_openstack.md')
| -rw-r--r-- | README_openstack.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/README_openstack.md b/README_openstack.md index 8d8f6ef3f..9a2b627e2 100644 --- a/README_openstack.md +++ b/README_openstack.md @@ -31,6 +31,7 @@ The following options are used only by `heat_stack.yaml`. They are so used only * `image_name`: Name of the image to use to spawn VMs * `public_key` (default to `~/.ssh/id_rsa.pub`): filename of the ssh public key +* `etcd_flavor` (default to `m1.small`): The ID or name of the flavor for the etcd nodes * `master_flavor` (default to `m1.small`): The ID or name of the flavor for the master * `node_flavor` (default to `m1.medium`): The ID or name of the flavor for the compute nodes * `infra_flavor` (default to `m1.small`): The ID or name of the flavor for the infrastructure nodes |