Remove config.json for old style nic config files when using new style
This removes the config.json used by os-apply-config for old style nic config files in the script invoked for new style nic config files. This will avoid the case when the network files are set up by run-os-net-config.sh and then later overwritten by os-apply-config. Change-Id: I8f17a53c392aac657b00afdecbb5e58a2e192787 Closes-Bug: 1758161
This commit is contained in:
parent
624fedb114
commit
9f4c691cca
|
@ -146,4 +146,12 @@ if [ -n '$network_config' ]; then
|
||||||
echo "ERROR: os-net-config configuration failed." >&2
|
echo "ERROR: os-net-config configuration failed." >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Remove files used by os-apply-config for old style configs
|
||||||
|
if [ -f /usr/libexec/os-apply-config/templates/etc/os-net-config/config.json ]; then
|
||||||
|
rm /usr/libexec/os-apply-config/templates/etc/os-net-config/config.json
|
||||||
|
fi
|
||||||
|
if [ -f /usr/libexec/os-apply-config/templates/etc/os-net-config/element_config.json ]; then
|
||||||
|
rm /usr/libexec/os-apply-config/templates/etc/os-net-config/element_config.json
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue