summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorBin Hu <bh526r@att.com>2016-01-17 21:12:43 -0800
committerBin Hu <bh526r@att.com>2016-01-18 05:14:26 +0000
commitc85f12f6ccdc09482dce1a2dc5fa4713b7ba12f4 (patch)
tree6931de145b303a828688949635a2b14522010dd4 /docs
parent5e102a5a80717600efb191b8e75e553a52d6bed5 (diff)
JIRA-IPVSIX29
Change-Id: I92f1994d667aa741ee4cf293659816a2ea9d8967 Signed-off-by: Bin Hu <bh526r@att.com> (cherry picked from commit 49dda850f897103171cf2aa2145d290d001a3ac1)
Diffstat (limited to 'docs')
-rw-r--r--docs/configguide/featureconfig.rst9
-rw-r--r--docs/reldoc/index.rst8
-rw-r--r--docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst6
3 files changed, 12 insertions, 11 deletions
diff --git a/docs/configguide/featureconfig.rst b/docs/configguide/featureconfig.rst
index c3f71a5..78ebfc6 100644
--- a/docs/configguide/featureconfig.rst
+++ b/docs/configguide/featureconfig.rst
@@ -92,8 +92,8 @@ Disable Security Groups in OpenStack ML2 Setup
**OPNFV-NATIVE-SEC-3**: After updating the settings, you will have to restart the
``Neutron`` and ``Nova`` services.
-**Please note that the commands of restarting ``Neutron`` and ``Nova`` would vary depending on the installer.
-Please refer to relevant documentation of specific installers**
+**Please note that the commands of restarting** ``Neutron`` **and** ``Nova`` **would vary
+depending on the installer. Please refer to relevant documentation of specific installers**
---------------------------------
Set Up Service VM as IPv6 vRouter
@@ -129,8 +129,8 @@ in ``devstack``, the following command should be used:
glance image-create --name 'Fedora22' --disk-format qcow2 --container-format bare --file ./Fedora-Cloud-Base-22-20150521.x86_64.qcow2
-**OPNFV-NATIVE-SETUP-4: This Step is Informational. OPNFV Installer has taken care of this Step
-during deployment. You may refer to this Step only if there is any issue, or if you are using other installers**.
+**OPNFV-NATIVE-SETUP-4: This step is Informational. OPNFV Installer has taken care of this step
+during deployment. You may refer to this step only if there is any issue, or if you are using other installers**.
We have to move the physical interface (i.e. the public network interface) to ``br-ex``, including moving
the public IP address and setting up default route. Please refer to ``OS-NATIVE-SETUP-4`` and
@@ -639,3 +639,4 @@ to reach external ``ipv6-router``.
exit
+
diff --git a/docs/reldoc/index.rst b/docs/reldoc/index.rst
index 968177f..f9c7a46 100644
--- a/docs/reldoc/index.rst
+++ b/docs/reldoc/index.rst
@@ -92,8 +92,8 @@ Disable Security Groups in OpenStack ML2 Setup
**OPNFV-NATIVE-SEC-3**: After updating the settings, you will have to restart the
``Neutron`` and ``Nova`` services.
-**Please note that the commands of restarting ``Neutron`` and ``Nova`` would vary depending on the installer.
-Please refer to relevant documentation of specific installers**
+**Please note that the commands of restarting** ``Neutron`` **and** ``Nova`` **would vary
+depending on the installer. Please refer to relevant documentation of specific installers**
---------------------------------
Set Up Service VM as IPv6 vRouter
@@ -129,8 +129,8 @@ in ``devstack``, the following command should be used:
glance image-create --name 'Fedora22' --disk-format qcow2 --container-format bare --file ./Fedora-Cloud-Base-22-20150521.x86_64.qcow2
-**OPNFV-NATIVE-SETUP-4: This Step is Informational. OPNFV Installer has taken care of this Step
-during deployment. You may refer to this Step only if there is any issue, or if you are using other installers**.
+**OPNFV-NATIVE-SETUP-4: This step is Informational. OPNFV Installer has taken care of this step
+during deployment. You may refer to this step only if there is any issue, or if you are using other installers**.
We have to move the physical interface (i.e. the public network interface) to ``br-ex``, including moving
the public IP address and setting up default route. Please refer to ``OS-NATIVE-SETUP-4`` and
diff --git a/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst b/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst
index d020521..a5f8fdc 100644
--- a/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst
+++ b/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst
@@ -161,8 +161,8 @@ configuration parameters.
**OS-NATIVE-SEC-3**: After updating the settings, you will have to restart the
``Neutron`` and ``Nova`` services.
-**Please note that the commands of restarting ``Neutron`` and ``Nova`` would vary depending on the installer.
-Please refer to relevant documentation of specific installers**
+**Please note that the commands of restarting** ``Neutron`` **and** ``Nova`` **would vary
+depending on the installer. Please refer to relevant documentation of specific installers**
*********************************
Set Up Service VM as IPv6 vRouter
@@ -200,7 +200,7 @@ the following command may be used for some other installers:
glance image-create --name 'Fedora22' --disk-format qcow2 --container-format bare --file ./Fedora-Cloud-Base-22-20150521.x86_64.qcow2
-**OS-NATIVE-SETUP-4**: Now We have to move the physical interface (i.e. the public network interface)
+**OS-NATIVE-SETUP-4**: Now we have to move the physical interface (i.e. the public network interface)
to ``br-ex``, including moving the public IP address and setting up default route. **Please note that this step
may already have been done when you use a different installer to deploy OpenStack because that installer
may have already moved the physical interface to** ``br-ex`` **during deployment**.