openstack/devstack
Code Issues Proposed changes

Clean up n-net remnants

Browse Source 
In I90316208d1af42c1659d3bee386f95e38aaf2c56 support for nova-network
was removed, but some bits remained, fix this up.

Change-Id: Iba7e1785fd0bdf0a6e94e5e03438fc7634621e49
This commit is contained in:
Dr. Jens Harbott 2022-08-21 10:52:41 +02:00
parent 90e5479f38
commit ca5f919561
5 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/debs/nova
View File

@ -1,7 +1,5 @@
conntrack conntrack
curl curl
dnsmasq-base
dnsmasq-utils # for dhcp_release
ebtables ebtables
genisoimage # required for config_drive genisoimage # required for config_drive
iptables iptables

2
files/rpms-suse/nova
View File

@ -1,8 +1,6 @@
cdrkit-cdrtools-compat # dist:sle12 cdrkit-cdrtools-compat # dist:sle12
conntrack-tools conntrack-tools
curl curl
dnsmasq
dnsmasq-utils # dist:opensuse-12.3,opensuse-13.1
ebtables ebtables
iptables iptables
iputils iputils

2
files/rpms/nova
View File

@ -1,7 +1,5 @@
conntrack-tools conntrack-tools
curl curl
dnsmasq # for q-dhcp
dnsmasq-utils # for dhcp_release
ebtables ebtables
genisoimage # not:rhel9 required for config_drive genisoimage # not:rhel9 required for config_drive
iptables iptables

14
lib/nova
View File

@ -107,20 +107,6 @@ NOVA_FILTERS="AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,Ima
QEMU_CONF=/etc/libvirt/qemu.conf QEMU_CONF=/etc/libvirt/qemu.conf
# Set default defaults here as some hypervisor drivers override these
PUBLIC_INTERFACE_DEFAULT=br100
# Set ``GUEST_INTERFACE_DEFAULT`` to some interface on the box so that
# the default isn't completely crazy. This will match ``eth*``, ``em*``, or
# the new ``p*`` interfaces, then basically picks the first
# alphabetically. It's probably wrong, however it's less wrong than
# always using ``eth0`` which doesn't exist on new Linux distros at all.
GUEST_INTERFACE_DEFAULT=$(ip link \
| grep 'state UP' \
| awk '{print $2}' \
| sed 's/://' \
| grep ^[ep] \
| head -1)
# ``NOVA_VNC_ENABLED`` can be used to forcibly enable VNC configuration. # ``NOVA_VNC_ENABLED`` can be used to forcibly enable VNC configuration.
# In multi-node setups allows compute hosts to not run ``n-novnc``. # In multi-node setups allows compute hosts to not run ``n-novnc``.
NOVA_VNC_ENABLED=$(trueorfalse False NOVA_VNC_ENABLED) NOVA_VNC_ENABLED=$(trueorfalse False NOVA_VNC_ENABLED)

8
stack.sh
View File

@ -1152,7 +1152,8 @@ fi
# ---- # ----
if is_service_enabled q-dhcp; then if is_service_enabled q-dhcp; then
# Delete traces of nova networks from prior runs # TODO(frickler): These are remnants from n-net, check which parts are really
# still needed for Neutron.
# Do not kill any dnsmasq instance spawned by NetworkManager # Do not kill any dnsmasq instance spawned by NetworkManager
netman_pid=$(pidof NetworkManager || true) netman_pid=$(pidof NetworkManager || true)
if [ -z "$netman_pid" ]; then if [ -z "$netman_pid" ]; then
@ -1212,12 +1213,7 @@ if is_service_enabled nova; then
echo_summary "Configuring Nova" echo_summary "Configuring Nova"
init_nova init_nova
# Additional Nova configuration that is dependent on other services
# TODO(stephenfin): Is it possible for neutron to *not* be enabled now? If
# not, remove the if here
if is_service_enabled neutron; then
async_runfunc configure_neutron_nova async_runfunc configure_neutron_nova
fi
fi fi