Remove cloud-init/network-config file from tests
- not used in oscap.sh test at all - causes VM in libvirt.sh test to acquire a different IP address instead of the hard-coded one inside the test, which causes SSH to fail - not used anywhere else
This commit is contained in:
parent
c0c4ecd937
commit
83cec26a5a
3 changed files with 1 additions and 17 deletions
|
|
@ -106,7 +106,6 @@ EOF
|
|||
CLOUD_INIT_DIR=$(mktemp -d)
|
||||
cp "${OSBUILD_COMPOSER_TEST_DATA}"/cloud-init/meta-data "${CLOUD_INIT_DIR}"/
|
||||
cp "${USER_DATA_FILE}" "${CLOUD_INIT_DIR}"/
|
||||
# cp "${OSBUILD_COMPOSER_TEST_DATA}"/cloud-init/network-config "${CLOUD_INIT_DIR}"/
|
||||
|
||||
# Set up a cloud-init ISO.
|
||||
gen_iso () {
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
network:
|
||||
version: 2
|
||||
renderer: NetworkManager
|
||||
ethernets:
|
||||
eth0:
|
||||
dhcpv4: false
|
||||
dhcpv6: false
|
||||
addresses:
|
||||
- 192.168.122.50/24
|
||||
gateway4: 192.168.122.1
|
||||
nameservers:
|
||||
addresses:
|
||||
- 1.1.1.1
|
||||
- 8.8.8.8
|
||||
|
|
@ -227,7 +227,6 @@ fi
|
|||
CLOUD_INIT_DIR=$(mktemp -d)
|
||||
cp "${OSBUILD_COMPOSER_TEST_DATA}"/cloud-init/meta-data "${CLOUD_INIT_DIR}"/
|
||||
cp "${SSH_DATA_DIR}"/user-data "${CLOUD_INIT_DIR}"/
|
||||
cp "${OSBUILD_COMPOSER_TEST_DATA}"/cloud-init/network-config "${CLOUD_INIT_DIR}"/
|
||||
|
||||
# Set up a cloud-init ISO.
|
||||
greenprint "💿 Creating a cloud-init ISO"
|
||||
|
|
@ -235,7 +234,7 @@ CLOUD_INIT_PATH=/var/lib/libvirt/images/seed.iso
|
|||
rm -f $CLOUD_INIT_PATH
|
||||
pushd "$CLOUD_INIT_DIR"
|
||||
sudo mkisofs -o $CLOUD_INIT_PATH -V cidata \
|
||||
-r -J user-data meta-data network-config > /dev/null 2>&1
|
||||
-r -J user-data meta-data > /dev/null 2>&1
|
||||
popd
|
||||
|
||||
# Ensure SELinux is happy with our new images.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue