u/fuel: Bump & rebase for proxy apache 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 75e239a..d7d8be1 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 a5fc061..b2d005b 100755
+index e8b4271..585a808 100755
 --- a/mcp/config/states/virtual_control_plane
 +++ b/mcp/config/states/virtual_control_plane
-@@ -14,6 +14,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
+@@ -25,6 +25,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
+   repl="\n        if not __salt__['pkg.version']('vlan'):\n            __salt__['pkg.install']('vlan')"
 
- # KVM, compute node prereqs (libvirt first), VCP deployment
  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
-@@ -44,6 +45,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
+@@ -55,6 +56,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; };