Merge "Multiple DHCP ranges for Ironic Inspector"
This commit is contained in:
commit
339e86d43c
|
@ -419,10 +419,11 @@ libvirt_enable_sasl: {{ kolla_libvirt_enable_sasl | bool }}
|
||||||
# Ironic options
|
# Ironic options
|
||||||
#############################
|
#############################
|
||||||
{% if kolla_inspector_dhcp_pool_start and kolla_inspector_dhcp_pool_end %}
|
{% if kolla_inspector_dhcp_pool_start and kolla_inspector_dhcp_pool_end %}
|
||||||
ironic_dnsmasq_dhcp_range: "{{ kolla_inspector_dhcp_pool_start }},{{ kolla_inspector_dhcp_pool_end }}{% if kolla_inspector_netmask %},{{ kolla_inspector_netmask }}{% endif %}"
|
ironic_dnsmasq_dhcp_ranges:
|
||||||
{% endif %}
|
- range: "{{ kolla_inspector_dhcp_pool_start }},{{ kolla_inspector_dhcp_pool_end }}{% if kolla_inspector_netmask %},{{ kolla_inspector_netmask }}{% endif %}"
|
||||||
{% if kolla_inspector_default_gateway %}
|
{% if kolla_inspector_default_gateway %}
|
||||||
ironic_dnsmasq_default_gateway: {{ kolla_inspector_default_gateway }}
|
routers: "{{ kolla_inspector_default_gateway }}"
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if kolla_inspector_extra_kernel_options %}
|
{% if kolla_inspector_extra_kernel_options %}
|
||||||
ironic_inspector_kernel_cmdline_extras:
|
ironic_inspector_kernel_cmdline_extras:
|
||||||
|
|
|
@ -124,8 +124,7 @@
|
||||||
- bifrost_network_interface
|
- bifrost_network_interface
|
||||||
- neutron_external_interface
|
- neutron_external_interface
|
||||||
- neutron_bridge_name
|
- neutron_bridge_name
|
||||||
- ironic_dnsmasq_dhcp_range
|
- ironic_dnsmasq_dhcp_ranges
|
||||||
- ironic_dnsmasq_default_gateway
|
|
||||||
|
|
||||||
- name: Check whether inventory files exist
|
- name: Check whether inventory files exist
|
||||||
stat:
|
stat:
|
||||||
|
|
|
@ -246,8 +246,9 @@
|
||||||
kolla_internal_fqdn_cert: "{{ temp_path }}/etc/kolla/certificates/internal.pem"
|
kolla_internal_fqdn_cert: "{{ temp_path }}/etc/kolla/certificates/internal.pem"
|
||||||
openstack_logging_debug: True
|
openstack_logging_debug: True
|
||||||
grafana_admin_username: "grafana-admin"
|
grafana_admin_username: "grafana-admin"
|
||||||
ironic_dnsmasq_dhcp_range: "1.2.3.4,1.2.3.5,255.255.255.0"
|
ironic_dnsmasq_dhcp_ranges:
|
||||||
ironic_dnsmasq_default_gateway: "1.2.3.6"
|
- range: "1.2.3.4,1.2.3.5,255.255.255.0"
|
||||||
|
routers: "1.2.3.6"
|
||||||
# NOTE: The following options are not present in globals.yml.
|
# NOTE: The following options are not present in globals.yml.
|
||||||
# It's possible this is related to the use of hostvars and
|
# It's possible this is related to the use of hostvars and
|
||||||
# include_role, caused by something like
|
# include_role, caused by something like
|
||||||
|
|
Loading…
Reference in New Issue