summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-02 19:36:23 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-03 17:15:59 +0000
commit37c7995f55e86f3bf4abac656e4676b7b688fcbd (patch)
tree09ff26e8ed8cd56a6d0d68ad607fecfa9b987738
parentb434464fee83f0edbb1b5204edc71998f9b7aa09 (diff)
salt modules: debian_ip: Accept uppercase ifaces
Since VMs are not affected by this limitation, only apply the fixup to baremetal nodes. JIRA: FUEL-299 Change-Id: Ib94c481627538d900295df03b8c8fdc7b61cd718 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 8f39b4895fa66223ef6293630556457f8fb9a348)
-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