openstack/devstack
Code Issues Proposed changes

Merge "Add dhcp server option to dnsmasq for baremetal"

Browse Source
This commit is contained in:
Jenkins
2013-02-08 15:29:09 +00:00
committed by Gerrit Code Review
parent 06178aa5fa 35336282da
commit 434bf036bf
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/baremetal
View File

@@ -90,6 +90,9 @@ else
BM_DNSMASQ_RANGE=${BM_DNSMASQ_RANGE:-} BM_DNSMASQ_RANGE=${BM_DNSMASQ_RANGE:-}
fi fi
# BM_DNSMASQ_DNS provide dns server to bootstrap clients
BM_DNSMASQ_DNS=${BM_DNSMASQ_DNS:-}
# BM_FIRST_MAC *must* be set to the MAC address of the node you will boot. # BM_FIRST_MAC *must* be set to the MAC address of the node you will boot.
# This is passed to dnsmasq along with the kernel/ramdisk to # This is passed to dnsmasq along with the kernel/ramdisk to
# deploy via PXE. # deploy via PXE.

4
stack.sh
View File

@@ -1300,8 +1300,8 @@ if is_service_enabled nova && is_baremetal; then
sudo pkill dnsmasq || true sudo pkill dnsmasq || true
sudo dnsmasq --conf-file= --port=0 --enable-tftp --tftp-root=/tftpboot \ sudo dnsmasq --conf-file= --port=0 --enable-tftp --tftp-root=/tftpboot \
--dhcp-boot=pxelinux.0 --bind-interfaces --pid-file=/var/run/dnsmasq.pid \ --dhcp-boot=pxelinux.0 --bind-interfaces --pid-file=/var/run/dnsmasq.pid \
--interface=$BM_DNSMASQ_IFACE --dhcp-range=$BM_DNSMASQ_RANGE --interface=$BM_DNSMASQ_IFACE --dhcp-range=$BM_DNSMASQ_RANGE \
${$BM_DNSMASQ_DNS:+--dhcp-option=option:dns-server,$BM_DNSMASQ_DNS}
# ensure callback daemon is running # ensure callback daemon is running
sudo pkill nova-baremetal-deploy-helper || true sudo pkill nova-baremetal-deploy-helper || true
screen_it baremetal "nova-baremetal-deploy-helper" screen_it baremetal "nova-baremetal-deploy-helper"