summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-19 05:49:46 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-19 03:49:57 +0000
commit652d99207dfc616e56ba19a8d9442817675581db (patch)
tree7234b608c8d255e17c77723980c935fa38c7172e /patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
parenta8ba1facc345bc6af997671933a7efc40a715608 (diff)
u/fuel: Bump & rebase for cmp network fix
Change-Id: I2d445a78ee6d25b826afe3c42d433b9c4af3d09d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit cdff247b728bd6d00ce7ed7f6994fd0688304fc1)
Diffstat (limited to 'patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch')
-rw-r--r--patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch4
1 files changed, 2 insertions, 2 deletions
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 7c188244..435d60ea 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 <Alexandru.Avadanii@enea.com>
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 602eab2..fe84222 100755
+index d0aea74..68b4f2f 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -23,6 +23,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
+@@ -24,6 +24,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