From 1e95ffeaac59aee8decf3ccf6721330de19f491e Mon Sep 17 00:00:00 2001
From: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date: Thu, 28 Jan 2016 17:51:39 +0900
Subject: contents for OPNFV composite docs

Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>

Change-Id: I557819f8a67b8882de87c94bbca8177a89b55d6d
---
 docs/platformoverview/doctor.rst           | 47 ----------------------------
 docs/platformoverview/index.rst            |  9 ------
 docs/platformoverview/platformoverview.rst | 49 ++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 56 deletions(-)
 delete mode 100644 docs/platformoverview/doctor.rst
 delete mode 100644 docs/platformoverview/index.rst
 create mode 100644 docs/platformoverview/platformoverview.rst

(limited to 'docs/platformoverview')

diff --git a/docs/platformoverview/doctor.rst b/docs/platformoverview/doctor.rst
deleted file mode 100644
index 6ee59a9f..00000000
--- a/docs/platformoverview/doctor.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-===============
-Doctor Platform
-===============
-
-https://wiki.opnfv.org/doctor
-
-Features
-========
-
-Doctor platform, as of Brahmaputra release, provides the two features:
-
-* Immediate Notification
-* Consistent resource state awareness (Compute)
-
-These features enable high availability of Network Services on top of
-the virtualized infrastructure. Immediate notification allows VNF managers
-(VNFM) to process recovery actions promptly once a failure has occurred.
-Consistency of resource state is necessary to properly execute recovery
-actions properly in the VIM.
-
-Components
-==========
-
-Doctor platform, as of Brahmaputra release, consists of the following
-components:
-
-* OpenStack Compute (Nova)
-* OpenStack Telemetry (Ceilometer)
-* OpenStack Alarming (Aodh)
-* Doctor Inspector
-* Doctor Monitor
-
-.. note::
-    Doctor Inspector and Monitor are sample implementation for reference.
-
-You can see an overview of the Doctor platform and how components interact in
-:numref:`figure-p1`.
-
-.. figure:: images/figure-p1.png
-    :name: figure-p1
-    :width: 100%
-
-    Doctor platform and typical sequence (Brahmaputra)
-
-Detailed information on the Doctor architecture can be found in the Doctor
-requirements documentation:
-http://artifacts.opnfv.org/doctor/docs/requirements/05-implementation.html
diff --git a/docs/platformoverview/index.rst b/docs/platformoverview/index.rst
deleted file mode 100644
index cee06eb3..00000000
--- a/docs/platformoverview/index.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-***************************
-Overview of Doctor Platform
-***************************
-
-.. toctree::
-   :numbered:
-   :maxdepth: 2
-
-   doctor.rst
diff --git a/docs/platformoverview/platformoverview.rst b/docs/platformoverview/platformoverview.rst
new file mode 100644
index 00000000..e6ef8859
--- /dev/null
+++ b/docs/platformoverview/platformoverview.rst
@@ -0,0 +1,49 @@
+Doctor platform components and features
+=======================================
+
+..
+    This section will be compiled into OPNFV composite document.
+
+https://wiki.opnfv.org/doctor
+
+Features
+--------
+
+Doctor platform, as of Brahmaputra release, provides the two features:
+
+* Immediate Notification
+* Consistent resource state awareness (Compute/host-down)
+
+These features enable high availability of Network Services on top of
+the virtualized infrastructure. Immediate notification allows VNF managers
+(VNFM) to process recovery actions promptly once a failure has occurred.
+Consistency of resource state is necessary to properly execute recovery
+actions properly in the VIM.
+
+Components
+----------
+
+Doctor platform, as of Brahmaputra release, consists of the following
+components:
+
+* OpenStack Compute (Nova)
+* OpenStack Telemetry (Ceilometer)
+* OpenStack Alarming (Aodh)
+* Doctor Inspector
+* Doctor Monitor
+
+.. note::
+    Doctor Inspector and Monitor are sample implementation for reference.
+
+You can see an overview of the Doctor platform and how components interact in
+:numref:`figure-p1`.
+
+.. figure:: images/figure-p1.png
+    :name: figure-p1
+    :width: 100%
+
+    Doctor platform and typical sequence (Brahmaputra)
+
+Detailed information on the Doctor architecture can be found in the Doctor
+requirements documentation:
+http://artifacts.opnfv.org/doctor/docs/requirements/05-implementation.html
-- 
cgit 1.2.3-korg