From 9d4231278605e68a7bc6f98253fdeafe4e696e59 Mon Sep 17 00:00:00 2001 From: "Kai Qiang Wu(Kennan)" Date: Wed, 13 May 2015 17:24:09 +0800 Subject: [PATCH] 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 --- doc/source/dev/dev-manual-devstack.rst | 6 +++--- doc/source/dev/dev-quickstart.rst | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/doc/source/dev/dev-manual-devstack.rst b/doc/source/dev/dev-manual-devstack.rst index bdeee5973e..8d84183bbf 100644 --- a/doc/source/dev/dev-manual-devstack.rst +++ b/doc/source/dev/dev-manual-devstack.rst @@ -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. diff --git a/doc/source/dev/dev-quickstart.rst b/doc/source/dev/dev-quickstart.rst index f95ca38530..d5f678cdec 100644 --- a/doc/source/dev/dev-quickstart.rst +++ b/doc/source/dev/dev-quickstart.rst @@ -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.