aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-08 02:09:51 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-08 02:09:51 +0000
commit62e032ab0276fde84df3384bd341aa53e87fc88a (patch)
tree6741daeda78f70d624b86811aca16c8af0d455e7
parente74a9a603b67084ab9e602a8ab7d4fc938ebf63a (diff)
parent37c7995f55e86f3bf4abac656e4676b7b688fcbd (diff)
Merge "salt modules: debian_ip: Accept uppercase ifaces" into stable/euphrates
-rwxr-xr-xmcp/config/states/virtual_control_plane3
1 files changed, 3 insertions, 0 deletions
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