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) --- .../0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch') diff --git a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index 9748da18..ee298bdb 100644 --- a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -29,10 +29,10 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/libvirt_domain_template.sls diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index c798209..57c5685 100755 +index 27614d0..ec3d5ac 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -33,6 +33,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ +@@ -32,6 +32,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp salt -C 'kvm*' state.sls armband || true -- cgit 1.2.3-korg