openstack/devstack
Code Issues Proposed changes

Stop configuring '[DEFAULT] firewall_driver' for nova

Browse Source 
This option has default to the 'NoopFirewallDriver' for some time and
will soon be removed. Stop configuring it entirely.

Change-Id: I4dbc0015cf26d7edf51d0d5fd978ccd3a1ad1b79
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane 2019-11-28 12:57:12 +00:00
parent 035b41b9b2
commit 248d4bb8d2
7 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/neutron
View File

@ -365,8 +365,6 @@ function configure_neutron_nova_new {
iniset $conf neutron auth_strategy $NEUTRON_AUTH_STRATEGY iniset $conf neutron auth_strategy $NEUTRON_AUTH_STRATEGY
iniset $conf neutron region_name "$REGION_NAME" iniset $conf neutron region_name "$REGION_NAME"
iniset $conf DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
# optionally set options in nova_conf # optionally set options in nova_conf
neutron_plugin_create_nova_conf $conf neutron_plugin_create_nova_conf $conf

5
lib/neutron-legacy
View File

@ -384,11 +384,6 @@ function create_nova_conf_neutron {
iniset $conf neutron auth_strategy "$Q_AUTH_STRATEGY" iniset $conf neutron auth_strategy "$Q_AUTH_STRATEGY"
iniset $conf neutron region_name "$REGION_NAME" iniset $conf neutron region_name "$REGION_NAME"
if [[ "$Q_USE_SECGROUP" == "True" ]]; then
LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver
iniset $conf DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER
fi
# optionally set options in nova_conf # optionally set options in nova_conf
neutron_plugin_create_nova_conf $conf neutron_plugin_create_nova_conf $conf

2
lib/neutron_plugins/nuage
View File

@ -11,8 +11,6 @@ function neutron_plugin_create_nova_conf {
local conf="$1" local conf="$1"
NOVA_OVS_BRIDGE=${NOVA_OVS_BRIDGE:-"br-int"} NOVA_OVS_BRIDGE=${NOVA_OVS_BRIDGE:-"br-int"}
iniset $conf neutron ovs_bridge $NOVA_OVS_BRIDGE iniset $conf neutron ovs_bridge $NOVA_OVS_BRIDGE
LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver
iniset $conf DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER
} }
function neutron_plugin_install_agent_packages { function neutron_plugin_install_agent_packages {

2
lib/nova_plugins/hypervisor-ironic
View File

@ -39,10 +39,8 @@ function configure_nova_hypervisor {
if ! is_ironic_hardware; then if ! is_ironic_hardware; then
configure_libvirt configure_libvirt
fi fi
LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.firewall.NoopFirewallDriver"}
iniset $NOVA_CONF DEFAULT compute_driver ironic.IronicDriver iniset $NOVA_CONF DEFAULT compute_driver ironic.IronicDriver
iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER
# ironic section # ironic section
iniset $NOVA_CONF ironic auth_type password iniset $NOVA_CONF ironic auth_type password

2
lib/nova_plugins/hypervisor-libvirt
View File

@ -45,8 +45,6 @@ function configure_nova_hypervisor {
iniset $NOVA_CONF libvirt live_migration_uri "qemu+ssh://$STACK_USER@%s/system" iniset $NOVA_CONF libvirt live_migration_uri "qemu+ssh://$STACK_USER@%s/system"
iniset $NOVA_CONF DEFAULT default_ephemeral_format "ext4" iniset $NOVA_CONF DEFAULT default_ephemeral_format "ext4"
iniset $NOVA_CONF DEFAULT compute_driver "libvirt.LibvirtDriver" iniset $NOVA_CONF DEFAULT compute_driver "libvirt.LibvirtDriver"
LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
iniset $NOVA_CONF DEFAULT firewall_driver "$LIBVIRT_FIREWALL_DRIVER"
# Power architecture currently does not support graphical consoles. # Power architecture currently does not support graphical consoles.
if is_arch "ppc64"; then if is_arch "ppc64"; then
iniset $NOVA_CONF vnc enabled "false" iniset $NOVA_CONF vnc enabled "false"

2
lib/nova_plugins/hypervisor-openvz
View File

@ -38,8 +38,6 @@ function cleanup_nova_hypervisor {
function configure_nova_hypervisor { function configure_nova_hypervisor {
iniset $NOVA_CONF DEFAULT compute_driver "openvz.OpenVzDriver" iniset $NOVA_CONF DEFAULT compute_driver "openvz.OpenVzDriver"
iniset $NOVA_CONF DEFAULT connection_type "openvz" iniset $NOVA_CONF DEFAULT connection_type "openvz"
LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
iniset $NOVA_CONF DEFAULT firewall_driver "$LIBVIRT_FIREWALL_DRIVER"
} }
# install_nova_hypervisor() - Install external components # install_nova_hypervisor() - Install external components

3
lib/nova_plugins/hypervisor-xenserver
View File

@ -61,9 +61,6 @@ function configure_nova_hypervisor {
iniset $NOVA_CONF xenserver connection_username "$XENAPI_USER" iniset $NOVA_CONF xenserver connection_username "$XENAPI_USER"
iniset $NOVA_CONF xenserver connection_password "$XENAPI_PASSWORD" iniset $NOVA_CONF xenserver connection_password "$XENAPI_PASSWORD"
iniset $NOVA_CONF DEFAULT flat_injected "False" iniset $NOVA_CONF DEFAULT flat_injected "False"
# Need to avoid crash due to new firewall support
XEN_FIREWALL_DRIVER=${XEN_FIREWALL_DRIVER:-"nova.virt.firewall.IptablesFirewallDriver"}
iniset $NOVA_CONF DEFAULT firewall_driver "$XEN_FIREWALL_DRIVER"
local dom0_ip local dom0_ip
dom0_ip=$(echo "$XENAPI_CONNECTION_URL" | cut -d "/" -f 3-) dom0_ip=$(echo "$XENAPI_CONNECTION_URL" | cut -d "/" -f 3-)