From 9b542ee2202c702445128e019b2454960d828651 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 21 Nov 2017 20:04:44 +0100 Subject: u/fuel: Fix patch apply failure after latest bump Change-Id: I7e05e05551bb1dee8f531e12fd60b85dcc67e695 Signed-off-by: Alexandru Avadanii (cherry picked from commit 72e0ffab0e9968161734183a72477a92b51c1a90) --- patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '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 8e27230b..16d58cbc 100644 --- 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,10 +21,10 @@ Signed-off-by: Guillermo Herrero 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 8b9e3ef..34fe956 100755 +index 44d7c6d..8fc03d4 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -23,6 +23,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ +@@ -22,6 +22,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 @@ -32,7 +32,7 @@ index 8b9e3ef..34fe956 100755 salt -C 'kvm*' state.apply linux.network salt -C 'cmp*' state.apply linux.system salt -C 'cmp*' state.apply linux.network || true -@@ -53,6 +54,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do +@@ -52,6 +53,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; }; -- cgit 1.2.3-korg