MaaS: Fix conflicting curtin network config 45/46845/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 7 Nov 2017 19:02:28 +0000 (20:02 +0100)
committerMichael Polenchuk <mpolenchuk@mirantis.com>
Wed, 8 Nov 2017 08:34:32 +0000 (08:34 +0000)
JIRA: FUEL-301

Change-Id: I9de98fb961fd1d480b45a774de61ad6a93e9addf
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 3803f9ff798b5c186e605cb8366b5153ab4e19fc)

mcp/config/states/virtual_control_plane

index 9ebf4bf..d02ea43 100755 (executable)
@@ -13,6 +13,7 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
 source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
 
 # KVM, compute node prereqs (libvirt first), VCP deployment
+salt -C 'kvm* or cmp*' cmd.run 'rm -f /etc/network/interfaces.d/*.cfg'
 salt -C 'kvm* or cmp*' file.line \
   /usr/lib/python2.7/dist-packages/salt/modules/debian_ip.py \
   content='iface = iface.lower()' mode='delete'