openstack
/
openstack-ansible-os_ironic
Code Issues Proposed changes

Merge "Allow ironic bmaas network gateway and dns servers to be undefined"

This commit is contained in:
Zuul 2022-12-06 19:32:07 +00:00 committed by Gerrit Code Review
parent a74e0fb31c c9674b656e
commit 3ec52b3414
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -383,7 +383,9 @@ ironic_inspector_dhcp_address: "{{ ironic_bmaas_address }}"
ironic_inspector_dhcp_pool_range: 192.168.0.51 192.168.0.150
ironic_inspector_dhcp_subnet: 192.168.0.0/22
ironic_inspector_dhcp_subnet_mask: 255.255.252.0
ironic_insepctor_dhcp_enable_gateway: True
ironic_inspector_dhcp_gateway: 192.168.0.1
ironic_inspector_dhcp_enable_nameservers: True
ironic_inspector_dhcp_nameservers: 192.168.0.1
ironic_inspector_dhcp_lease_time: 600

4
templates/dhcpd.conf.j2
View File

@ -11,8 +11,12 @@ set pxetype = option pxe-system-type;
subnet {{ ironic_inspector_dhcp_subnet }} netmask {{ ironic_inspector_dhcp_subnet_mask }} {
{% if ironic_inspector_enable_dhcp_gateway | bool %}
option routers {{ ironic_inspector_dhcp_gateway }};
{% endif %}
{% if ironic_inspector_enable_dhcp_nameservers | bool %}
option domain-name-servers {{ ironic_inspector_dhcp_nameservers}};
{% endif %}
option subnet-mask {{ ironic_inspector_dhcp_subnet_mask }};
range dynamic-bootp {{ ironic_inspector_dhcp_pool_range }};
default-lease-time {{ ironic_inspector_dhcp_lease_time }};