diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-28 19:10:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-28 19:10:30 +0000 |
| commit | ac12632ead6dad3293e964f2597362444062c47e (patch) | |
| tree | 2b13fcd2735739afa7319a7e3e4a8e98edede429 | |
| parent | 5311f86822fab4bddd11018399b23dfd4119daf4 (diff) | |
| parent | 58ef5fee023a9d5268c1b8c0ba913b96406c7b68 (diff) | |
| download | kolla-ac12632ead6dad3293e964f2597362444062c47e.tar.gz kolla-ac12632ead6dad3293e964f2597362444062c47e.zip | |
Merge "Recommend vagrant and heat for development only"
| -rw-r--r-- | doc/quickstart.rst | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/doc/quickstart.rst b/doc/quickstart.rst index 119d0824f..287020fb2 100644 --- a/doc/quickstart.rst +++ b/doc/quickstart.rst @@ -4,21 +4,20 @@ Deployment of Kolla on Bare Metal or Virtual Machine Evaluation and Developer Environments ------------------------------------- -Two virtualized evaluation and development environment options are -available. These options permit the evaluation of Kolla without -disrupting the host operating system. +Two virtualized development environment options are available for Kolla. +These options permit the development of Kolla without disrupting the host +operating system. -If developing or evaluating Kolla on an OpenStack cloud -environment that supports Heat, follow the :doc:`Heat evaluation -and developer environment guide <heat-dev-env>`. +If developing Kolla on an OpenStack cloud environment that supports Heat, +follow the :doc:`Heat developer environment guide <heat-dev-env>`. -If developing or evaluating Kolla on a system that provides -VirtualBox or Libvirt in addition to Vagrant, use the Vagrant virtual -environment documented in :doc:`Vagrant evaluation and -developer environment guide <vagrant-dev-env>`. +If developing Kolla on a system that provides VirtualBox or Libvirt in addition +to Vagrant, use the Vagrant virtual environment documented in +:doc:`Vagrant developer environment guide <vagrant-dev-env>`. -If evaluating or deploying OpenStack on bare-metal with Kolla, -follow the instructions in this document to get started. +If evaluating Kolla, the community strongly recommends using bare metal or a +virtual machine during the evaluation period. Follow the instructions in this +document to get started with deploying OpenStack on bare metal with Kolla. Host machine requirements ------------------------- |