diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-07 20:02:28 +0100 |
|---|---|---|
| committer |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-11-08 08:34:32 +0000 |
| commit | e708686d0d6727feca64609ed5ff8e2328c0b5f5 (patch) | |
| tree | 1787d7111d4217bc536be72c88836b9be1f46c56 | |
| parent | 62e032ab0276fde84df3384bd341aa53e87fc88a (diff) | |
MaaS: Fix conflicting curtin network config
JIRA: FUEL-301
Change-Id: I9de98fb961fd1d480b45a774de61ad6a93e9addf
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 3803f9ff798b5c186e605cb8366b5153ab4e19fc)
| -rwxr-xr-x | mcp/config/states/virtual_control_plane | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index 9ebf4bf69..d02ea4398 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -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' |