summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-07-26 02:00:05 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-07-26 02:00:05 +0200
commitf9e87162f57a5fcc7cfa6f68cbd818c3306d3dec (patch)
treec6101fe03a3aea68fee22fe09842ee2dd08c9099 /patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
parentb2cc542dabde2ff8e7217e251d54d80d810c8e4b (diff)
u/fuel: Bump & rebase for _orchestration.conf fix
Change-Id: Ifb4ba7e0bb06b214e682e76ec3204c7e5d411f05 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch')
-rw-r--r--patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch6
1 files changed, 3 insertions, 3 deletions
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 086cfcab..cc405a13 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,11 +41,11 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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 6a44b788..6f935445 100755
+index 3e5f659f..674a1bfd 100755
--- a/mcp/config/states/baremetal_init
+++ b/mcp/config/states/baremetal_init
-@@ -31,6 +31,7 @@ wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply opnfv.route_wrapper"
- wait_for 5.0 "salt -C 'cmp*' state.apply linux.network"
+@@ -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"
+salt -C 'kvm*' state.apply armband.salt_minion