u/fuel: Bump & rebase for sphinx metadata fix

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

diff --git a/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch
index a5b2d90..72c04ee 100644 (file)
--- a/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch
@@ -22,7 +22,7 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
  create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
 
 diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
-index 2de3b9f3..1dde8527 100755
+index 5a1e9ab7..9fa5d5a7 100755
 --- a/mcp/config/states/baremetal_init
 +++ b/mcp/config/states/baremetal_init
 @@ -23,6 +23,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
@@ -31,7 +31,7 @@ index 2de3b9f3..1dde8527 100755
  salt -C 'kvm* or cmp*' pkg.install bridge-utils
 +salt -C 'kvm* or cmp*' state.apply opnfv.adduser
  salt -C 'kvm*' state.apply linux.network,linux.system.kernel
- salt -C 'kvm* or cmp*' state.apply salt.minion
+ wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply salt.minion"
  wait_for 5.0 "salt -C 'cmp*' state.apply linux.system"
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
 index 02a813c9..a179b22c 100755