Browse code
Stop configuring '[DEFAULT] firewall_driver' for nova
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>
Stephen Finucane authored on 2019/11/28 21:57:12Showing 7 changed files
- lib/neutron
- lib/neutron-legacy
- lib/neutron_plugins/nuage
- lib/nova_plugins/hypervisor-ironic
- lib/nova_plugins/hypervisor-libvirt
- lib/nova_plugins/hypervisor-openvz
- lib/nova_plugins/hypervisor-xenserver
| ... | ... |
@@ -365,8 +365,6 @@ function configure_neutron_nova_new {
|
| 365 | 365 |
iniset $conf neutron auth_strategy $NEUTRON_AUTH_STRATEGY |
| 366 | 366 |
iniset $conf neutron region_name "$REGION_NAME" |
| 367 | 367 |
|
| 368 |
- iniset $conf DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver |
|
| 369 |
- |
|
| 370 | 368 |
# optionally set options in nova_conf |
| 371 | 369 |
neutron_plugin_create_nova_conf $conf |
| 372 | 370 |
|
| ... | ... |
@@ -384,11 +384,6 @@ function create_nova_conf_neutron {
|
| 384 | 384 |
iniset $conf neutron auth_strategy "$Q_AUTH_STRATEGY" |
| 385 | 385 |
iniset $conf neutron region_name "$REGION_NAME" |
| 386 | 386 |
|
| 387 |
- if [[ "$Q_USE_SECGROUP" == "True" ]]; then |
|
| 388 |
- LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver |
|
| 389 |
- iniset $conf DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER |
|
| 390 |
- fi |
|
| 391 |
- |
|
| 392 | 387 |
# optionally set options in nova_conf |
| 393 | 388 |
neutron_plugin_create_nova_conf $conf |
| 394 | 389 |
|
| ... | ... |
@@ -11,8 +11,6 @@ function neutron_plugin_create_nova_conf {
|
| 11 | 11 |
local conf="$1" |
| 12 | 12 |
NOVA_OVS_BRIDGE=${NOVA_OVS_BRIDGE:-"br-int"}
|
| 13 | 13 |
iniset $conf neutron ovs_bridge $NOVA_OVS_BRIDGE |
| 14 |
- LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver |
|
| 15 |
- iniset $conf DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER |
|
| 16 | 14 |
} |
| 17 | 15 |
|
| 18 | 16 |
function neutron_plugin_install_agent_packages {
|
| ... | ... |
@@ -39,10 +39,8 @@ function configure_nova_hypervisor {
|
| 39 | 39 |
if ! is_ironic_hardware; then |
| 40 | 40 |
configure_libvirt |
| 41 | 41 |
fi |
| 42 |
- LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.firewall.NoopFirewallDriver"}
|
|
| 43 | 42 |
|
| 44 | 43 |
iniset $NOVA_CONF DEFAULT compute_driver ironic.IronicDriver |
| 45 |
- iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER |
|
| 46 | 44 |
|
| 47 | 45 |
# ironic section |
| 48 | 46 |
iniset $NOVA_CONF ironic auth_type password |
| ... | ... |
@@ -45,8 +45,6 @@ function configure_nova_hypervisor {
|
| 45 | 45 |
iniset $NOVA_CONF libvirt live_migration_uri "qemu+ssh://$STACK_USER@%s/system" |
| 46 | 46 |
iniset $NOVA_CONF DEFAULT default_ephemeral_format "ext4" |
| 47 | 47 |
iniset $NOVA_CONF DEFAULT compute_driver "libvirt.LibvirtDriver" |
| 48 |
- LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
|
|
| 49 |
- iniset $NOVA_CONF DEFAULT firewall_driver "$LIBVIRT_FIREWALL_DRIVER" |
|
| 50 | 48 |
# Power architecture currently does not support graphical consoles. |
| 51 | 49 |
if is_arch "ppc64"; then |
| 52 | 50 |
iniset $NOVA_CONF vnc enabled "false" |
| ... | ... |
@@ -38,8 +38,6 @@ function cleanup_nova_hypervisor {
|
| 38 | 38 |
function configure_nova_hypervisor {
|
| 39 | 39 |
iniset $NOVA_CONF DEFAULT compute_driver "openvz.OpenVzDriver" |
| 40 | 40 |
iniset $NOVA_CONF DEFAULT connection_type "openvz" |
| 41 |
- LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
|
|
| 42 |
- iniset $NOVA_CONF DEFAULT firewall_driver "$LIBVIRT_FIREWALL_DRIVER" |
|
| 43 | 41 |
} |
| 44 | 42 |
|
| 45 | 43 |
# install_nova_hypervisor() - Install external components |
| ... | ... |
@@ -61,9 +61,6 @@ function configure_nova_hypervisor {
|
| 61 | 61 |
iniset $NOVA_CONF xenserver connection_username "$XENAPI_USER" |
| 62 | 62 |
iniset $NOVA_CONF xenserver connection_password "$XENAPI_PASSWORD" |
| 63 | 63 |
iniset $NOVA_CONF DEFAULT flat_injected "False" |
| 64 |
- # Need to avoid crash due to new firewall support |
|
| 65 |
- XEN_FIREWALL_DRIVER=${XEN_FIREWALL_DRIVER:-"nova.virt.firewall.IptablesFirewallDriver"}
|
|
| 66 |
- iniset $NOVA_CONF DEFAULT firewall_driver "$XEN_FIREWALL_DRIVER" |
|
| 67 | 64 |
|
| 68 | 65 |
local dom0_ip |
| 69 | 66 |
dom0_ip=$(echo "$XENAPI_CONNECTION_URL" | cut -d "/" -f 3-) |