From 4c2ba9a86aa2d6ec1ab260c9ffbfcf3d1ec55dc9 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Thu, 8 Oct 2015 09:17:52 +0200 Subject: [PATCH] [install] share edit /etc/hosts file instructions Change-Id: Ica17124ef2a24bed35118fc4070c3f31dd826c8d Implements: blueprint installguide-liberty --- .../source/cinder-storage-node.rst | 15 ++---- .../source/environment-networking-compute.rst | 32 +---------- .../environment-networking-controller.rst | 32 +---------- .../environment-networking-storage-swift.rst | 54 +------------------ .../source/shared/edit_hosts_file.txt | 31 +++++++++++ 5 files changed, 39 insertions(+), 125 deletions(-) create mode 100644 doc/install-guide/source/shared/edit_hosts_file.txt diff --git a/doc/install-guide/source/cinder-storage-node.rst b/doc/install-guide/source/cinder-storage-node.rst index 3f82128f95..cf7efd052a 100644 --- a/doc/install-guide/source/cinder-storage-node.rst +++ b/doc/install-guide/source/cinder-storage-node.rst @@ -23,7 +23,7 @@ the storage node contains one network interface on the needs an empty block storage device of suitable size for your environment. For more information, see :ref:`environment`. -1. Configure the management interface: +#. Configure the management interface: * IP address: ``10.0.0.41`` @@ -31,18 +31,11 @@ environment. For more information, see :ref:`environment`. * Default gateway: ``10.0.0.1`` -2. Set the hostname of the node to ``block1``. +#. Set the hostname of the node to ``block1``. -3. Copy the contents of the :file:`/etc/hosts` file from the - controller node to the storage node and add the following to it:: +#. .. include:: shared/edit_hosts_file.txt - # block1 - 10.0.0.41 block1 - - Also add this content to the :file:`/etc/hosts` file - on all other nodes in your environment. - -4. Install and configure :term:`NTP` using the instructions in +#. Install and configure :term:`NTP` using the instructions in :ref:`environment-ntp`. .. only:: obs diff --git a/doc/install-guide/source/environment-networking-compute.rst b/doc/install-guide/source/environment-networking-compute.rst index e0c325cddf..0cb7517ec2 100644 --- a/doc/install-guide/source/environment-networking-compute.rst +++ b/doc/install-guide/source/environment-networking-compute.rst @@ -66,34 +66,4 @@ Configure name resolution #. Set the hostname of the node to ``compute1``. -#. Edit the :file:`/etc/hosts` file to contain the following: - - .. code-block:: ini - - # controller - 10.0.0.11 controller - - # compute1 - 10.0.0.31 compute1 - - # block1 - 10.0.0.41 block1 - - # object1 - 10.0.0.51 object1 - - # object2 - 10.0.0.52 object2 - - .. warning:: - - Some distributions add an extraneous entry in the :file:`/etc/hosts` - file that resolves the actual hostname to another loopback IP - address such as ``127.0.1.1``. You must comment out or remove this - entry to prevent name resolution problems. **Do not remove the - 127.0.0.1 entry.** - - .. note:: - - To reduce complexity of this guide, we add host entries for optional - services regardless of whether you choose to deploy them. +# .. include:: shared/edit_hosts_file.txt diff --git a/doc/install-guide/source/environment-networking-controller.rst b/doc/install-guide/source/environment-networking-controller.rst index a84b23b197..83ddbc13f1 100644 --- a/doc/install-guide/source/environment-networking-controller.rst +++ b/doc/install-guide/source/environment-networking-controller.rst @@ -62,34 +62,4 @@ Configure name resolution #. Set the hostname of the node to ``controller``. -#. Edit the :file:`/etc/hosts` file to contain the following: - - .. code-block:: ini - - # controller - 10.0.0.11 controller - - # compute1 - 10.0.0.31 compute1 - - # block1 - 10.0.0.41 block1 - - # object1 - 10.0.0.51 object1 - - # object2 - 10.0.0.52 object2 - - .. warning:: - - Some distributions add an extraneous entry in the :file:`/etc/hosts` - file that resolves the actual hostname to another loopback IP - address such as ``127.0.1.1``. You must comment out or remove this - entry to prevent name resolution problems. **Do not remove the - 127.0.0.1 entry.** - - .. note:: - - To reduce complexity of this guide, we add host entries for optional - services regardless of whether you choose to deploy them. +# .. include:: shared/edit_hosts_file.txt diff --git a/doc/install-guide/source/environment-networking-storage-swift.rst b/doc/install-guide/source/environment-networking-storage-swift.rst index 248afdcba5..a2dc429071 100644 --- a/doc/install-guide/source/environment-networking-storage-swift.rst +++ b/doc/install-guide/source/environment-networking-storage-swift.rst @@ -23,32 +23,7 @@ Configure name resolution #. Set the hostname of the node to ``object1``. -#. Edit the ``/etc/hosts`` file to contain the following: - - .. code-block:: ini - - # controller - 10.0.0.11 controller - - # compute1 - 10.0.0.31 compute1 - - # block1 - 10.0.0.41 block1 - - # object1 - 10.0.0.51 object1 - - # object2 - 10.0.0.52 object2 - - .. warning:: - - Some distributions add an extraneous entry in the ``/etc/hosts`` - file that resolves the actual hostname to another loopback IP - address such as ``127.0.1.1``. You must comment out or remove this - entry to prevent name resolution problems. **Do not remove the - 127.0.0.1 entry.** +#. .. include:: shared/edit_hosts_file.txt #. Reboot the system to activate the changes. @@ -71,31 +46,6 @@ Configure name resolution #. Set the hostname of the node to ``object2``. -#. Edit the ``/etc/hosts`` file to contain the following: - - .. code-block:: ini - - # controller - 10.0.0.11 controller - - # compute1 - 10.0.0.31 compute1 - - # block1 - 10.0.0.41 block1 - - # object1 - 10.0.0.51 object1 - - # object2 - 10.0.0.52 object2 - - .. warning:: - - Some distributions add an extraneous entry in the ``/etc/hosts`` - file that resolves the actual hostname to another loopback IP - address such as ``127.0.1.1``. You must comment out or remove this - entry to prevent name resolution problems. **Do not remove the - 127.0.0.1 entry.** +#. .. include:: shared/edit_hosts_file.txt #. Reboot the system to activate the changes. diff --git a/doc/install-guide/source/shared/edit_hosts_file.txt b/doc/install-guide/source/shared/edit_hosts_file.txt new file mode 100644 index 0000000000..541000afd5 --- /dev/null +++ b/doc/install-guide/source/shared/edit_hosts_file.txt @@ -0,0 +1,31 @@ +Edit the ``/etc/hosts`` file to contain the following: + +.. code-block:: ini + + # controller + 10.0.0.11 controller + + # compute1 + 10.0.0.31 compute1 + + # block1 + 10.0.0.41 block1 + + # object1 + 10.0.0.51 object1 + + # object2 + 10.0.0.52 object2 + +.. warning:: + + Some distributions add an extraneous entry in the ``/etc/hosts`` + file that resolves the actual hostname to another loopback IP + address such as ``127.0.1.1``. You must comment out or remove this + entry to prevent name resolution problems. **Do not remove the + 127.0.0.1 entry.** + +.. note:: + + To reduce complexity of this guide, we add host entries for optional + services regardless of whether you choose to deploy them.