From a6f5b5b13b3d9b62a9ee13d7bf19b695802bc5ce Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 22 Aug 2017 17:33:05 +0200 Subject: p/fuel: Rebase: openstack_ha upstream sync Change-Id: I87a2259ddcbc3ab69cde7a3f3e78a79dc907a5d9 Signed-off-by: Alexandru Avadanii --- ...s-maas-Retry-applying-VCP-VMs-linux-state.patch | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 patches/opnfv-fuel/0020-states-maas-Retry-applying-VCP-VMs-linux-state.patch (limited to 'patches/opnfv-fuel/0020-states-maas-Retry-applying-VCP-VMs-linux-state.patch') diff --git a/patches/opnfv-fuel/0020-states-maas-Retry-applying-VCP-VMs-linux-state.patch b/patches/opnfv-fuel/0020-states-maas-Retry-applying-VCP-VMs-linux-state.patch deleted file mode 100644 index f34cce8c..00000000 --- a/patches/opnfv-fuel/0020-states-maas-Retry-applying-VCP-VMs-linux-state.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Alexandru Avadanii -Date: Tue, 22 Aug 2017 02:19:34 +0200 -Subject: [PATCH] states: maas: Retry applying VCP VMs linux state - -Running a heavy state like `linux` on all nodes (including VCP VMs) -might time out the first time on slower systems. - -Signed-off-by: Alexandru Avadanii ---- - mcp/config/states/maas | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index f8ff67a..371688a 100755 ---- a/mcp/config/states/maas -+++ b/mcp/config/states/maas -@@ -71,4 +71,4 @@ done - - salt -C '* and not cfg01* and not mas01*' saltutil.sync_all - salt -C '* and not cfg01* and not mas01*' state.apply salt --salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp -+wait_for "salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp" -- cgit 1.2.3-korg