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 --- .../0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch') diff --git a/patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index f56cb68a..dda55e42 100644 --- a/patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -21,10 +21,10 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/libvirt_domain_template.sls diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 13a8263..fef7a62 100755 +index f83f4a7..bc8d04f 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas -@@ -48,7 +48,7 @@ wait_for "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'" +@@ -51,7 +51,7 @@ wait_for "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'" salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp -- cgit 1.2.3-korg