openstack
/
magnum
Code Issues Proposed changes

Fix doc according to devstack support 

Right now, we have templates only vm, we not have baremetal
support now, so I did not doc the baremetal. You can check
template_definition.py for details.

Closes-Bug: #1454591
Change-Id: Ic3bb36bfbdd3a1c68bb40c745db0d38c46f32b86
This commit is contained in:
Kai Qiang Wu(Kennan) 2015-05-13 17:24:09 +08:00
parent ed5b34a1a9
commit 9d42312786
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/dev/dev-manual-devstack.rst
View File

@ -7,9 +7,9 @@ If you are getting started with Magnum it is recommended you follow the
:ref:`dev-quickstart` to get up and running with Magnum. This guide covers
a more in-depth process to setup Magnum with devstack.
Magnum depends on Nova, Glance, Heat, and Neutron to create and schedule
virtual machines to simulate bare-metal. For milestone #2 we intend to
introduce support for Ironic deployment of baremetal nodes.
Magnum depends on Nova, Glance, Heat and Neutron to create and schedule
virtual machines to simulate bare-metal. For bare-metal fully support, it
is still under active development.
This session has only been tested on Ubuntu 14.04 (Trusty) and Fedora 20/21.
We recommend users to select one of them if it is possible.

9
doc/source/dev/dev-quickstart.rst
View File

@ -96,11 +96,10 @@ To discover and interact with templates, please refer to
Exercising the Services Using DevStack
======================================
DevStack does not yet have Magnum support. It is, however, necessary to
develop Magnum from a devstack environment at the present time. Magnum depends
on Nova, Heat, and Neutron to create and schedule virtual machines to simulate
bare-metal. For milestone #2 we intend to introduce support for Ironic
deployment of baremetal nodes.
DevStack can be configured to enable Magnum support. It is easy to develop Magnum
with devstack environment. Magnum depends on Nova, Glance, Heat and Neutron to
create and schedule virtual machines to simulate bare-metal. For bare-metal fully
support, it is still under active development.
This session has only been tested on Ubuntu 14.04 (Trusty) and Fedora 20/21.
We recommend users to select one of them if it is possible.