[Docs] dnsmasq.template fix

1. Removes documentation about manual update of the dnsmasq.template
   file from the Operations guide.
2. Removes the file description from the File reference guide as it
   is autogenerated.

Change-Id: I76bd8b0b2929e447ca61fbdcdb1d7419c2c1a98a
Closes-Bug: #1512342
This commit is contained in:
OlgaGusarenko 2015-11-03 16:24:54 +02:00
parent d50b602ebf
commit ce318e857e
4 changed files with 0 additions and 109 deletions

View File

@ -34,10 +34,6 @@ but may not be complete.
| :ref:`astute-yaml-target-ref` | Target | Configuration attributes |
| | | passed to Puppet |
+-------------------------------+-------------+-------------------------------+
| :ref:`dnsmasq-template-ref` | Fuel Master | Configures DHCP networks for |
| | | additional Fuel Admin (PXE) |
| | | networks |
+-------------------------------+-------------+-------------------------------+
| :ref:`engine-yaml-ref` | Fuel Master | Provisioning engine (Cobbler) |
| | | and basic configuration of |
| | | target nodes |
@ -56,7 +52,6 @@ but may not be complete.
.. include:: /pages/file-ref/astute-yaml-master.rst
.. include:: /pages/file-ref/astute-yaml-target.rst
.. include:: /pages/file-ref/engine-yaml.rst
.. include:: /pages/file-ref/dnsmasq-template.rst
.. include:: /pages/file-ref/network-1-yaml.rst
.. include:: /pages/file-ref/openstack-yaml.rst
.. include:: /pages/file-ref/settings-yaml.rst

View File

@ -1,98 +0,0 @@
.. raw:: pdf
PageBreak
.. _dnsmasq-template-ref:
dnsmasq.template
----------------
Fuel Master Node:
**/etc/cobbler/dnsmasq.template**
The *dnsmasq.template* file defines the DHCP networks
used for :ref:`Multiple Cluster Networks<mcn-arch>`.
The networks listed here must match
the `fuelweb_admin` networks that are defined in Fuel.
Usage
~~~~~
#. Log into the cobbler :ref:`docker-term` container:
::
dockerctl shell cobbler
#. Edit file.
::
vi /etc/cobbler/dnsmasq.template
#. Rebuild the dnsmasq configuration and reload it:
::
cobbler sync
#. Exit the Cobbler docker container:
::
exit
File Format
~~~~~~~~~~~
Each `fuelweb_admin` network must be defined in this file:
.. code-block:: sh
dhcp-range=<name>,<start-IP-addr>,<end-IP-addr>,<netmask>,[<leasetime>]
dhcp-option=net:<name>,option:router,<IP-addr-of-gateway>
dhcp-boot=net:<name>,pxelinux.0,boothost,<Fuel-Master-IP-addr>
:env-name: Unique name of this network in **dnsmasq**
:start-IP-addr: Starting IP address of DHCP range
:end-IP-addr: Ending IP address of DHCP range
:netmask: Netmask for DHCP network
:leasetime: DHCP lease time; default value is 60 minutes
:IP-addr-of-gateway: IP address of gateway (router) in the network segment
:Fuel-Master-IP-addr: IP address of the Fuel Master node
For example:
.. code-block:: sh
dhcp-range=alpha,10.110.1.68,10.110.1.127,255.255.255.192,120m
dhcp-option=net:alpha,option:router,10.110.1.65
dhcp-boot=net:alpha,pxelinux.0,boothost,10.110.0.2
The network must forward the DHCP packets for the other logical
networks that are defined in the
:ref:`network_1.yaml<network-1-yaml-ref>` file.
It is also possible to set up a proxy using
the Linux **dhcp-helper** program
so that the target nodes can boot.
Note that the *dnsmasq.template* file is managed
by :ref:`Puppet<puppet-term>`
so all changes are overwritten/removed when the Puppet container is restarted
or the Fuel Master node is rebooted.
See also
~~~~~~~~
- :ref:`mcn-ops`
- :ref:`mcn-arch`
- :ref:`network_1.yaml<network-1-yaml-ref>`

View File

@ -28,9 +28,6 @@ Requirements for an environment that runs multiple cluster networks are:
To configure an environment that uses multiple cluster networks,
do the following.
#. Add each DHCP network into the
:ref:`dnsmasq.template<dnsmasq-template-ref>` file.
#. Start a **dhcp-helper** process:
.. code-block:: sh

View File

@ -52,9 +52,6 @@ in the current cluster:
- Each :ref:`logical network<logical-networks-arch>`
is associated with a Node Group rather than with a cluster.
- Each fuelweb_admin network must have a DHCP network
configured in the :ref:`dnsmasq.template<dnsmasq-template-ref>` file.
- DHCP requests can be forwarded to the Fuel Master node
using either of the following methods: