openstack
/
instack-undercloud
Code Issues Proposed changes

Merge "Use the new dnsmasq PXE filter in ironic-inspector"

This commit is contained in:
Zuul 2018-03-26 19:56:04 +00:00 committed by Gerrit Code Review
parent 4721d004c6 5e1a4d9f0b
commit 95da0b59b8
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/puppet-stack-config/puppet-stack-config.pp
View File

@ -522,6 +522,8 @@ include ::ironic::drivers::staging
include ::ironic::glance
include ::ironic::inspector
include ::ironic::inspector::cors
include ::ironic::inspector::pxe_filter
include ::ironic::inspector::pxe_filter::dnsmasq
include ::ironic::neutron
include ::ironic::pxe
include ::ironic::service_catalog

2
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@ -584,6 +584,8 @@ ironic::inspector::swift_auth_url: "%{hiera('keystone_auth_uri')}"
ironic::inspector::dnsmasq_local_ip: {{LOCAL_IP}}
ironic::inspector::dnsmasq_interface: {{INSPECTION_INTERFACE}}
ironic::inspector::dnsmasq_ip_subnets: {{{INSPECTION_SUBNETS}}}
ironic::inspector::pxe_filter::driver: dnsmasq
ironic::inspector::dnsmasq_dhcp_hostsdir: '/var/lib/ironic-inspector/dhcp-hostsdir'
ironic::inspector::ramdisk_collectors: {{INSPECTION_COLLECTORS}}
ironic::inspector::additional_processing_hooks: 'extra_hardware,lldp_basic,local_link_connection'
ironic::inspector::ramdisk_kernel_args: {{INSPECTION_KERNEL_ARGS}}

3
releasenotes/notes/ironic-inspector-use-pxe-filter-dnsmasq-611a69bc12011989.yaml Normal file
View File

@ -0,0 +1,3 @@
---
fixes:
- Using the ``dnsmasq`` PXE filter for inspection fixes bug #1756075.