From b6c697cf8c2106f53c9e65a0fb523cc7b16f506d Mon Sep 17 00:00:00 2001
From: chenxing <chason.chan@foxmail.com>
Date: Tue, 29 May 2018 20:35:25 +0800
Subject: [PATCH] Update the step of 'etcd' installation

There is distro package available for etcd3 now, let's install etcd
by "apt install".

Change-Id: I7b2de5b2f8e3f6f2aa787e4c6d309b4e4e1d6e97
Closes-Bug: #1770984
---
 .../source/environment-etcd-obs.rst           |  7 +--
 .../source/environment-etcd-rdo.rst           |  7 +--
 .../source/environment-etcd-ubuntu.rst        | 53 ++++---------------
 doc/install-guide/source/environment-etcd.rst |  3 +-
 4 files changed, 21 insertions(+), 49 deletions(-)

diff --git a/doc/install-guide/source/environment-etcd-obs.rst b/doc/install-guide/source/environment-etcd-obs.rst
index f6d755b9ed..1527aea1d8 100644
--- a/doc/install-guide/source/environment-etcd-obs.rst
+++ b/doc/install-guide/source/environment-etcd-obs.rst
@@ -1,12 +1,13 @@
+=============
 Etcd for SUSE
-~~~~~~~~~~~~~
+=============
 
 Right now, there is no distro package available for etcd3. This guide uses
 the tarball installation as a workaround until proper distro packages are
 available.
 
 Install and configure components
---------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 #. Install etcd:
 
@@ -100,7 +101,7 @@ Install and configure components
 
 
 Finalize installation
----------------------
+~~~~~~~~~~~~~~~~~~~~~
 
 #. Enable and start the etcd service:
 
diff --git a/doc/install-guide/source/environment-etcd-rdo.rst b/doc/install-guide/source/environment-etcd-rdo.rst
index 3e2918f67d..38758afd37 100644
--- a/doc/install-guide/source/environment-etcd-rdo.rst
+++ b/doc/install-guide/source/environment-etcd-rdo.rst
@@ -1,12 +1,13 @@
+========================
 Etcd for RHEL and CentOS
-~~~~~~~~~~~~~~~~~~~~~~~~
+========================
 
 OpenStack services may use Etcd, a distributed reliable key-value store
 for distributed key locking, storing configuration, keeping track of service
 live-ness and other scenarios.
 
 Install and configure components
---------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 #. Install the package:
 
@@ -39,7 +40,7 @@ Install and configure components
 
 
 Finalize installation
----------------------
+~~~~~~~~~~~~~~~~~~~~~
 
 #. Enable and start the etcd service:
 
diff --git a/doc/install-guide/source/environment-etcd-ubuntu.rst b/doc/install-guide/source/environment-etcd-ubuntu.rst
index 65f3c0b1a7..0c28bacda4 100644
--- a/doc/install-guide/source/environment-etcd-ubuntu.rst
+++ b/doc/install-guide/source/environment-etcd-ubuntu.rst
@@ -2,53 +2,22 @@
 Etcd for Ubuntu
 ===============
 
-Right now, there is no distro package available for etcd3. This guide uses
-the tarball installation as a workaround until proper distro packages are
-available.
+OpenStack services may use Etcd, a distributed reliable key-value store
+for distributed key locking, storing configuration, keeping track of service
+live-ness and other scenarios.
 
 Install and configure components
---------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-#. Install etcd:
+#. Install the package:
 
-   - Create etcd user:
+   .. code-block:: console
 
-     .. code-block:: console
+      # apt install etcd
 
-        # groupadd --system etcd
-        # useradd --home-dir "/var/lib/etcd" \
-              --system \
-              --shell /bin/false \
-              -g etcd \
-              etcd
+   .. end
 
-     .. end
-
-   - Create the necessary directories:
-
-     .. code-block:: console
-
-        # mkdir -p /etc/etcd
-        # chown etcd:etcd /etc/etcd
-        # mkdir -p /var/lib/etcd
-        # chown etcd:etcd /var/lib/etcd
-
-     .. end
-
-   - Download and install the etcd tarball:
-
-     .. code-block:: console
-
-        # ETCD_VER=v3.2.7
-        # rm -rf /tmp/etcd && mkdir -p /tmp/etcd
-        # curl -L https://github.com/coreos/etcd/releases/download/${ETCD_VER}/etcd-${ETCD_VER}-linux-amd64.tar.gz -o /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz
-        # tar xzvf /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz -C /tmp/etcd --strip-components=1
-        # cp /tmp/etcd/etcd /usr/bin/etcd
-        # cp /tmp/etcd/etcdctl /usr/bin/etcdctl
-
-     .. end
-
-2. Create and edit the ``/etc/etcd/etcd.conf.yml`` file
+#. Edit the ``/etc/etcd/etcd.conf.yml`` file
    and set the ``initial-cluster``, ``initial-advertise-peer-urls``,
    ``advertise-client-urls``, ``listen-client-urls`` to the management
    IP address of the controller node to enable access by other nodes via
@@ -68,7 +37,7 @@ Install and configure components
 
    .. end
 
-3. Create and edit the ``/lib/systemd/system/etcd.service`` file:
+#. Create and edit the ``/lib/systemd/system/etcd.service`` file:
 
    .. code-block:: ini
 
@@ -89,7 +58,7 @@ Install and configure components
    .. end
 
 Finalize installation
----------------------
+~~~~~~~~~~~~~~~~~~~~~
 
 #. Enable and start the etcd service:
 
diff --git a/doc/install-guide/source/environment-etcd.rst b/doc/install-guide/source/environment-etcd.rst
index 7fe7a218aa..ff89a3cc75 100644
--- a/doc/install-guide/source/environment-etcd.rst
+++ b/doc/install-guide/source/environment-etcd.rst
@@ -1,5 +1,6 @@
+====
 Etcd
-~~~~
+====
 
 OpenStack services may use Etcd, a distributed reliable key-value store
 for distributed key locking, storing configuration, keeping track of service