From de6c7142512838ec82b1d38df5f8679e2dc37941 Mon Sep 17 00:00:00 2001 From: Bin Hu Date: Wed, 23 Dec 2015 14:58:21 -0800 Subject: JIRA: IPVSIX-29 Change-Id: Ic5edbfa4f4d90a21cbcede9d9c844cfc55f3e4c3 Signed-off-by: Bin Hu --- docs/setupservicevm/index.rst | 7 +------ docs/setupservicevm/scenario-3.rst | 17 +++++++++++++++++ docs/setupservicevm/test/index.rst | 12 ------------ 3 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 docs/setupservicevm/scenario-3.rst delete mode 100644 docs/setupservicevm/test/index.rst diff --git a/docs/setupservicevm/index.rst b/docs/setupservicevm/index.rst index b3432a9..944efa2 100644 --- a/docs/setupservicevm/index.rst +++ b/docs/setupservicevm/index.rst @@ -16,9 +16,4 @@ Setting Up a Service VM as an IPv6 vRouter :numbered: :maxdepth: 4 - 0-ipv6-configguide-prep-infra.rst - 1-ipv6-configguide-odl-setup.rst - 2-ipv6-configguide-os-controller.rst - 3-ipv6-configguide-os-compute.rst - 4-ipv6-configguide-servicevm.rst - test/index.rst + scenario-3.rst diff --git a/docs/setupservicevm/scenario-3.rst b/docs/setupservicevm/scenario-3.rst new file mode 100644 index 0000000..0c5c432 --- /dev/null +++ b/docs/setupservicevm/scenario-3.rst @@ -0,0 +1,17 @@ +=============================================================== +Scenario 3 - OpenStack + Open Daylight Lithium Official Release +=============================================================== + +Scenario 3 is the environment of OpenStack + Open Daylight Lithium Official Release. Because Lithium Official +Release does not support IPv6 L3 Routing, we need to enable Neutron L3 Agent instead of Open Daylight L3 +function, while we still use Open Daylight for L2 switching. + +.. toctree:: + :numbered: + :maxdepth: 4 + + 0-ipv6-configguide-prep-infra.rst + 1-ipv6-configguide-odl-setup.rst + 2-ipv6-configguide-os-controller.rst + 3-ipv6-configguide-os-compute.rst + 4-ipv6-configguide-servicevm.rst diff --git a/docs/setupservicevm/test/index.rst b/docs/setupservicevm/test/index.rst deleted file mode 100644 index d3f1ed0..0000000 --- a/docs/setupservicevm/test/index.rst +++ /dev/null @@ -1,12 +0,0 @@ -========================================== -Setting Up a Service VM as an IPv6 vRouter -========================================== - -:Abstract: This is a test - -.. toctree:: - :numbered: - :maxdepth: 4 - - ../0-ipv6-configguide-prep-infra.rst - ../1-ipv6-configguide-odl-setup.rst -- cgit 1.2.3-korg