openstack
/
octavia
Code Issues Proposed changes

Merge "Remove unnecessary interface configurations"

This commit is contained in:
Zuul 2019-11-27 20:32:18 +00:00 committed by Gerrit Code Review
parent a308ad28bf 7ad61bb451
commit 728550103f
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
diskimage-create/diskimage-create.sh
View File

@ -407,6 +407,7 @@ AMP_element_sequence="$AMP_element_sequence no-resolvconf"
AMP_element_sequence="$AMP_element_sequence amphora-agent"
AMP_element_sequence="$AMP_element_sequence sos"
AMP_element_sequence="$AMP_element_sequence cloud-init-datasources"
AMP_element_sequence="$AMP_element_sequence remove-default-ints"
if [ "$AMP_ENABLE_FULL_MAC_SECURITY" -ne 1 ]; then
# SELinux systems

6
elements/remove-default-ints/README.rst Normal file
View File

@ -0,0 +1,6 @@
This element removes any default network interfaces from the interface
configuration in the image. These are not needed in the amphora as cloud-init
will create the required default interface configuration files.
For Ubuntu this element will remove the network
configuration files from /etc/network/interfaces.d.

8
elements/remove-default-ints/post-install.d/91-remove-default-ints Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
set -eu
set -o xtrace
if [[ "$DISTRO_NAME" == "ubuntu" ]]; then
sudo rm -f /etc/network/interfaces.d/*
fi