diff options
| author | Lucas Alvares Gomes <lucasagomes@gmail.com> | 2014-06-30 17:00:56 +0100 |
|---|---|---|
| committer | Lucas Alvares Gomes <lucasagomes@gmail.com> | 2014-07-22 10:16:45 +0100 |
| commit | a9d7a6567fb89ac59b5d1eb1df3cfee662268f98 (patch) | |
| tree | 7eebde733cb5d667934ae580f35c842d9fbea5ae /etc | |
| parent | 036c79e38f994121022a69a0bc76917e0048fd63 (diff) | |
| download | ironic-a9d7a6567fb89ac59b5d1eb1df3cfee662268f98.tar.gz | |
Rename/update common/tftp.py to common/pxe_utils.py
The functions in the common/tftp.py are not related to TFTP, the
functions are PXE related and most of them are used to generate the
PXE configuration file. Moving it from tftp.py to pxe_utils.py will make
it less confusing and is also needed by the iPXE work since iPXE doesn't
generate any configuration file under the TFTP folder.
The dhcp_options_for_instance() method was updated to not receive the PXE
boot file image from the parameters and just get it from the configuration
because we were always using the value from the configuration anyway.
Implements: blueprint ipxe-boot
Change-Id: Icfbaa4d6cdb9cbe0c392bf3dbd50ad980c70560c
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ironic/ironic.conf.sample | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index d510f86a5..39097fa4b 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -972,6 +972,13 @@ # Directory where images are stored on disk. (string value) #images_path=/var/lib/ironic/images/ +# IP address of Ironic compute node's tftp server. (string +# value) +#tftp_server=$my_ip + +# Ironic compute node's tftp root path. (string value) +#tftp_root=/tftpboot + # Directory where master tftp images are stored on disk. # (string value) #tftp_master_path=/tftpboot/master_images @@ -1016,17 +1023,3 @@ #libvirt_uri=qemu:///system -[tftp] - -# -# Options defined in ironic.common.tftp -# - -# IP address of Ironic compute node's tftp server. (string -# value) -#tftp_server=$my_ip - -# Ironic compute node's tftp root path. (string value) -#tftp_root=/tftpboot - - |