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) --- .../opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch') diff --git a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch index 3c413887..e4fcfc07 100644 --- a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch @@ -68,10 +68,10 @@ index e1fdf73..e1f705c 100755 salt -I 'mongodb:server' state.sls mongodb || true wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index b9db08a..c798209 100755 +index cfd5e42..27614d0 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -32,6 +32,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ +@@ -31,6 +31,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp -- cgit 1.2.3-korg