u/fuel: Bump & rebase for MaaS fabrics fix

[armband.git] / patches / opnfv-fuel / 0013-Add-opnfv-user-to-the-deployment.patch

diff --git a/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch
index d5df3da..7c58ec3 100644 (file)
--- a/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch
@@ -21,18 +21,18 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
  create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
 
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 0afd530..ccf7152 100755
+index 1657d3c..4b3ec42 100755
 --- a/mcp/config/states/virtual_control_plane
 +++ b/mcp/config/states/virtual_control_plane
-@@ -17,6 +17,7 @@ salt -C 'kvm* or cmp*' file.line \
-   /usr/lib/python2.7/dist-packages/salt/modules/debian_ip.py \
-   content='iface = iface.lower()' mode='delete'
+@@ -37,6 +37,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
+   repl="\n        if not __salt__['pkg.version']('vlan'):\n            __salt__['pkg.install']('vlan')"
+
  salt -C 'kvm*' pkg.install bridge-utils
 +salt -C '*' state.apply opnfv.adduser
  salt -C 'kvm*' state.apply linux.network
  salt -C 'cmp*' state.apply linux.system
  salt -C 'cmp*' state.apply linux.network || true
-@@ -47,6 +48,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
+@@ -67,6 +68,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
    rc=0
    for node in $vcp_nodes; do
      salt "$node" test.ping 2>/dev/null || { rc=$?; break; };