diff --git a/doc/source/installation-manual.rst b/doc/source/installation-manual.rst index 50d98fa7..511cfaef 100644 --- a/doc/source/installation-manual.rst +++ b/doc/source/installation-manual.rst @@ -103,7 +103,7 @@ Installation with Central Neutron Server cd tricircle python cmd/api.py --config-file etc/api.conf -- 7 Configurate the Tricircle Xjob daemon:: +- 7 Configure the Tricircle Xjob daemon:: cd tricircle/etc cp xjob.conf.sample xjob.conf diff --git a/doc/source/multi-pod-installation-devstack.rst b/doc/source/multi-pod-installation-devstack.rst index 470dc4fa..ce509bcf 100644 --- a/doc/source/multi-pod-installation-devstack.rst +++ b/doc/source/multi-pod-installation-devstack.rst @@ -75,7 +75,7 @@ external network. In this guide, the external network is also VLAN type, so the local.conf sample is based on VLAN type external network setup. For the resource requirements to setup each node, please refer to `All-In-One Single Machine `_ -for installing DevStack in physical machine and +for installing DevStack in bare metal server and `All-In-One Single VM `_ for installing DevStack in virtual machine. @@ -88,7 +88,7 @@ RegionOne, - 1 Install DevStack. Please refer to `DevStack document `_ - on how to install DevStack into single VM or physical machine. + on how to install DevStack into single VM or bare metal server. - 2 In DevStack folder, create a file local.conf, and copy the content of `local.conf node1 sample `_ @@ -141,7 +141,7 @@ In pod2 in node2 for OpenStack RegionTwo, - 1 Install DevStack. Please refer to `DevStack document `_ - on how to install DevStack into single VM or physical machine. + on how to install DevStack into single VM or bare metal server. - 2 In DevStack folder, create a file local.conf, and copy the content of `local.conf node2 sample `_ diff --git a/doc/source/single-pod-installation-devstack.rst b/doc/source/single-pod-installation-devstack.rst index 206174f0..a3560fac 100644 --- a/doc/source/single-pod-installation-devstack.rst +++ b/doc/source/single-pod-installation-devstack.rst @@ -5,13 +5,13 @@ Single pod installation with DevStack Now the Tricircle can be played with all-in-one single pod DevStack. For the resource requirement to setup single pod DevStack, please refer to `All-In-One Single Machine `_ for -installing DevStack in physical machine +installing DevStack in bare metal server or `All-In-One Single VM `_ for installing DevStack in virtual machine. - 1 Install DevStack. Please refer to `DevStack document `_ - on how to install DevStack into single VM or physcial machine + on how to install DevStack into single VM or bare metal server. - 2 In DevStack folder, create a file local.conf, and copy the content of https://github.com/openstack/tricircle/blob/master/devstack/local.conf.sample