From 81107c99211551f915999b398cee2dc3c55a39b1 Mon Sep 17 00:00:00 2001
From: Yikun Jiang <yikunkero@gmail.com>
Date: Sat, 29 Sep 2018 18:06:34 +0800
Subject: [PATCH] Clean up the deprecated description in doc

The nova-objectstore and nova-network is already deprecated.

This patch remove these deprecated description.

trivial_fix

Change-Id: I2967e9f836c07d09749e4db023a2bbf1b5c91fe3
---
 doc/source/admin/blockstorage-manage-volumes.rst | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/source/admin/blockstorage-manage-volumes.rst b/doc/source/admin/blockstorage-manage-volumes.rst
index 04bcdccae16..3f7b2171cd7 100644
--- a/doc/source/admin/blockstorage-manage-volumes.rst
+++ b/doc/source/admin/blockstorage-manage-volumes.rst
@@ -32,11 +32,10 @@ to a server instance.
      instance gets a new disk (usually a ``/dev/vdX`` disk).
 
 For this particular walkthrough, one cloud controller runs
-``nova-api``, ``nova-scheduler``, ``nova-objectstore``,
-``nova-network`` and ``cinder-*`` services. Two additional compute
-nodes run ``nova-compute``. The walkthrough uses a custom
-partitioning scheme that carves out 60 GB of space and labels it as
-LVM. The network uses the ``FlatManager`` and ``NetworkManager``
+``nova-api``, ``nova-scheduler``, ``nova-conductor`` and ``cinder-*``
+services. Two additional compute nodes run ``nova-compute``. The walkthrough
+uses a custom partitioning scheme that carves out 60 GB of space and labels it
+as LVM. The network uses the ``FlatManager`` and ``NetworkManager``
 settings for OpenStack Compute.
 
 The network mode does not interfere with OpenStack Block Storage