From aedf6ed1184ba41ecd9a27750e71d99ee35057f3 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 9 Aug 2018 17:35:34 +0200 Subject: u/fuel: Bump & rebase for Salt 2017.7 bump Change-Id: Ia69496c0dfed2ac47b9d72f51e9d16956fe07c58 Signed-off-by: Alexandru Avadanii --- ...2-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch') diff --git a/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index cc405a13..8fb84e14 100644 --- a/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -41,16 +41,16 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/salt_minion.sls diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init -index 3e5f659f..674a1bfd 100755 +index 358e1874..14d6a570 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init -@@ -28,6 +28,7 @@ wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply salt.minion" - wait_for 5.0 "salt -C 'cmp*' state.apply linux.system,linux.network" - wait_for 30.0 "salt -C 'kvm* or cmp*' test.ping" +@@ -32,6 +32,7 @@ wait_for 5.0 "salt -C '${cluster_nodes_query}' state.apply salt.minion" + wait_for 5.0 "salt -C '${compute_nodes_query}' state.apply linux.system,linux.network" + wait_for 30.0 "salt -C '${cluster_nodes_query}' test.ping" -+salt -C 'kvm*' state.apply armband.salt_minion - salt -C 'kvm* or cmp*' system.reboot - wait_for 90.0 "salt -C 'kvm* or cmp*' test.ping" ++salt -C "${control_nodes_query}" state.apply armband.salt_minion + salt -C "${cluster_nodes_query}" system.reboot + wait_for 90.0 "salt -C '${cluster_nodes_query}' test.ping" diff --git a/mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff b/mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff new file mode 100644 -- cgit 1.2.3-korg