Merge "Reinstate [DEFAULT] firewall_driver option"

This commit is contained in:
Jenkins 2017-07-06 22:44:08 +00:00 committed by Gerrit Code Review
commit ae6de97e6c

View File

@ -14,6 +14,12 @@ metadata_workers = {{ openstack_service_workers }}
metadata_listen = {{ api_interface_address }}
metadata_listen_port = {{ nova_metadata_port }}
# NOTE(mgoddard): This option has been deprecated but RDO sets a different
# default value for it in /usr/share/nova/nova-dist.conf which causes the
# ironic virt driver to fail to load. See
# https://bugs.launchpad.net/kolla-ansible/+bug/1701564.
firewall_driver = nova.virt.firewall.NoopFirewallDriver
allow_resize_to_same_host = true
{% if enable_ironic | bool %}