diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-07-16 14:00:52 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-07-16 14:00:52 -0400 |
| commit | e0211ca67ce18fc9f74d0a9c82cf14a28f395e4d (patch) | |
| tree | 1f349f91d3c20baab4b29b7b3207ca29e0801816 /README_openstack.md | |
| parent | adce78d68470b341b761372a70d06b5aec88de06 (diff) | |
| parent | 4b439253e7b4486947d201714d4f52a4a7e0fc01 (diff) | |
| download | openshift-e0211ca67ce18fc9f74d0a9c82cf14a28f395e4d.tar.gz openshift-e0211ca67ce18fc9f74d0a9c82cf14a28f395e4d.tar.bz2 openshift-e0211ca67ce18fc9f74d0a9c82cf14a28f395e4d.tar.xz openshift-e0211ca67ce18fc9f74d0a9c82cf14a28f395e4d.zip | |
Merge pull request #315 from lhuard1A/all_os_in_heat
Make all the OpenStack resources be managed by a Heat Stack
Diffstat (limited to 'README_openstack.md')
| -rw-r--r-- | README_openstack.md | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/README_openstack.md b/README_openstack.md index 57977d1f5..3076e7b08 100644 --- a/README_openstack.md +++ b/README_openstack.md @@ -28,19 +28,15 @@ The following options can be passed via the `-o` flag of the `create` command: * `image_name`: Name of the image to use to spawn VMs * `keypair` (default to `${LOGNAME}_key`): Name of the ssh key * `public_key` (default to `~/.ssh/id_rsa.pub`): filename of the ssh public key -* `master_flavor_ram` (default to `2048`): VM flavor for the master (by amount of RAM) -* `master_flavor_id`: VM flavor for the master (by ID) -* `master_flavor_include`: VM flavor for the master (by name) -* `node_flavor_ram` (default to `4096`): VM flavor for the nodes (by amount of RAM) -* `node_flavor_id`: VM flavor for the nodes (by ID) -* `node_flavor_include`: VM flavor for the nodes (by name) -* `infra_heat_stack` (default to `playbooks/openstack/openshift-cluster/files/heat_stack.yml`): filename of the HEAT template to use to create the cluster infrastructure +* `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 nodes +* `infra_heat_stack` (default to `playbooks/openstack/openshift-cluster/files/heat_stack.yaml`): filename of the HEAT template to use to create the cluster infrastructure -The following options are used only by `heat_stack.yml`. They are so used only if the `infra_heat_stack` option is left with its default value. +The following options are used only by `heat_stack.yaml`. They are so used only if the `infra_heat_stack` option is left with its default value. * `network_prefix` (default to `openshift-ansible-<cluster_id>`): prefix prepended to all network objects (net, subnet, router, security groups) * `dns` (default to `8.8.8.8,8.8.4.4`): comma separated list of DNS to use -* `net_cidr` (default to `192.168.<rand()>.0/24`): CIDR of the network created by `heat_stack.yml` +* `net_cidr` (default to `192.168.<rand()>.0/24`): CIDR of the network created by `heat_stack.yaml` * `external_net` (default to `external`): Name of the external network to connect to * `floating_ip_pools` (default to `external`): comma separated list of floating IP pools * `ssh_from` (default to `0.0.0.0/0`): IPs authorized to connect to the VMs via ssh |