From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Wed, 8 Nov 2017 02:09:51 +0000 (+0000)
Subject: Merge "salt modules: debian_ip: Accept uppercase ifaces" into stable/euphrates
X-Git-Tag: opnfv-5.1.RC1~52
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=62e032ab0276fde84df3384bd341aa53e87fc88a;hp=e74a9a603b67084ab9e602a8ab7d4fc938ebf63a;p=fuel.git

Merge "salt modules: debian_ip: Accept uppercase ifaces" into stable/euphrates
---

diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 065086991..9ebf4bf69 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -13,6 +13,9 @@ 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*' file.line \
+  /usr/lib/python2.7/dist-packages/salt/modules/debian_ip.py \
+  content='iface = iface.lower()' mode='delete'
 salt -C 'kvm*' pkg.install bridge-utils
 salt -C 'kvm*' state.apply linux.network
 salt -C 'cmp*' state.apply linux.system