openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove config.json for old style nic config files when using new style" into stable/queens

This commit is contained in:
Zuul 2018-04-12 20:53:44 +00:00 committed by Gerrit Code Review
parent 29bf121e05 d5f8581e26
commit 7d84eff6ce
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
network/scripts/run-os-net-config.sh
View File

@ -146,4 +146,12 @@ if [ -n '$network_config' ]; then
echo "ERROR: os-net-config configuration failed." >&2
exit 1
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