aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-19 02:24:52 +0000
committerGerrit Code Review <review@openstack.org>2016-08-19 02:24:52 +0000
commit69513eae4877c2862a8c27b095de6d3969ddd935 (patch)
tree50015242cc933bc0209ea4b3f00b24d905c52f2a /doc
parent2cb242f5b8662c4ecbc50a3f2075c954715ad372 (diff)
parentb2a79051ec5f0313ecc4c725152294cd2283d742 (diff)
downloadkolla-69513eae4877c2862a8c27b095de6d3969ddd935.tar.gz
kolla-69513eae4877c2862a8c27b095de6d3969ddd935.zip
Merge "Fix guide formating errors"
Diffstat (limited to 'doc')
-rw-r--r--doc/advanced-configuration.rst4
-rw-r--r--doc/cinder-guide.rst18
2 files changed, 14 insertions, 8 deletions
diff --git a/doc/advanced-configuration.rst b/doc/advanced-configuration.rst
index 1139f8829..db66ac1e0 100644
--- a/doc/advanced-configuration.rst
+++ b/doc/advanced-configuration.rst
@@ -206,5 +206,5 @@ first disable the deployment of the central logging.
enable_central_logging: "no"
-Now you can use the parameter ``elasticsearch_address`` to configure the address
-of the external Elasticsearch environment.
+Now you can use the parameter ``elasticsearch_address`` to configure the
+address of the external Elasticsearch environment.
diff --git a/doc/cinder-guide.rst b/doc/cinder-guide.rst
index 461189b1f..221912d1f 100644
--- a/doc/cinder-guide.rst
+++ b/doc/cinder-guide.rst
@@ -101,7 +101,8 @@ exist on the server and following parameter must be specified in
enable_cinder_backend_lvm: "yes"
-NOTE: For Ubuntu and LVM2/iSCSI
+For Ubuntu and LVM2/iSCSI
+~~~~~~~~~~~~~~~~~~~~~~~~~
``iscsd`` process uses configfs which is normally mounted at
``/sys/kernel/config`` to store discovered targets information, on centos/rhel
@@ -112,11 +113,16 @@ targeted for nova compute role.
- Add configfs module to ``/etc/modules``
- Rebuild initramfs using: ``update-initramfs -u`` command
- - Stop ``open-iscsi`` system service due to its conflicts with iscsid container.
- For Ubuntu 14.04 (upstart): ``service open-iscsi stop``,
- Ubuntu 16.04 (systemd): ``systemctl stop open-iscsi; systemctl stop iscsid``
+ - Stop ``open-iscsi`` system service due to its conflicts
+ with iscsid container.
+
+ For Ubuntu 14.04 (upstart): ``service open-iscsi stop``
+
+ Ubuntu 16.04 (systemd):
+ ``systemctl stop open-iscsi; systemctl stop iscsid``
- Make sure configfs gets mounted during a server boot up process. There are
- multiple ways to accomplish it, one example: ::
+ multiple ways to accomplish it, one example:
+ ::
- mount -t configfs /etc/rc.local /sys/kernel/config
+ mount -t configfs /etc/rc.local /sys/kernel/config