openstack/bifrost
Code Issues Proposed changes

Merge "Allow configuring the default route pushed by dnsmasq"

Browse Source
This commit is contained in:
Jenkins 2015-09-02 19:07:33 +00:00 committed by Gerrit Code Review
commit 9eeb2c24e3
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
playbooks/inventory/group_vars/localhost
View File

@ -57,3 +57,8 @@ transform_boot_image: false
# Create IPA image instead of downloading an pre-made CoreOS IPA image. # Create IPA image instead of downloading an pre-made CoreOS IPA image.
create_ipa_image: false create_ipa_image: false
# Dnsmasq default route for clients. If not defined, dnsmasq will push to clients
# as default route the same IP of the dnsmasq server.
# Default: undefined
# dnsmasq_router: {{ ipv4_gateway }}

6
playbooks/roles/bifrost-ironic-install/defaults/main.yml
View File

@ -45,8 +45,12 @@ shade_git_folder: /opt/stack/shade
dib_git_folder: /opt/stack/diskimage-builder dib_git_folder: /opt/stack/diskimage-builder
# Comma separated list, in the format of a string, of drivers that are enabled. # Comma separated list, in the format of a string, of drivers that are enabled.
enabled_drivers: "agent_ipmitool,pxe_amt,agent_ilo,agent_ucs" enabled_drivers: "agent_ipmitool,pxe_amt,agent_ilo,agent_ucs"
# DHCP pool for requests # DHCP pool for requests.
dhcp_pool_start: 192.168.1.200 dhcp_pool_start: 192.168.1.200
dhcp_pool_end: 192.168.1.250 dhcp_pool_end: 192.168.1.250
# Default network interface that Bifrost will be attached to. # Default network interface that Bifrost will be attached to.
network_interface: "virbr0" network_interface: "virbr0"
# Dnsmasq default route for clients. If not defined, dnsmasq will push to clients
# as default route the same IP of the dnsmasq server.
# Default: undefined
# dnsmasq_router:

6
playbooks/roles/bifrost-ironic-install/templates/dnsmasq.conf.j2
View File

@ -321,9 +321,11 @@ dhcp-range={{dhcp_pool_start}},{{dhcp_pool_end}},12h
# Override the default route supplied by dnsmasq, which assumes the # Override the default route supplied by dnsmasq, which assumes the
# router is the same machine as the one running dnsmasq. # router is the same machine as the one running dnsmasq.
#dhcp-option=3,1.2.3.4 {% if dnsmasq_router is defined %}
dhcp-option=3,{{dnsmasq_router}}
{% endif %}
# Do the same thing, but using the option name # Do the same thing, but using the option name.
#dhcp-option=option:router,1.2.3.4 #dhcp-option=option:router,1.2.3.4
# Override the default route supplied by dnsmasq and send no default # Override the default route supplied by dnsmasq and send no default