summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-16 01:11:12 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-16 01:11:12 +0000
commit13b071a86f5c552be17f12ae90ae73b94c1dc741 (patch)
tree73e1d786de5cbf3234e6e9bf5c153a2a820f87d7 /patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
parent40f2e0e9a211949b416bf28fab5ae736d199c93b (diff)
parenta4e42550c023bd746143ba323de2bcc61e758bbb (diff)
Merge "u/fuel: Bump & rebase for common reclass rework" into stable/euphrates
Diffstat (limited to 'patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch')
-rw-r--r--patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 73a0a786..3db98f5d 100644
--- a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0008-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 79ad880..327b159 100755
+index c645ffd..fb47893 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -12,7 +12,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected
+@@ -18,7 +18,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected
salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp