diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-28 19:45:08 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-28 19:48:36 +0200 |
commit | 2da79800d8ee9bc4210740255a42f7ec7a65c072 (patch) | |
tree | 4ea8e4651f485b918a2fe51732583c511e852eb0 /patches/opnfv-fuel/0014-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | |
parent | e0d9c392488c74393574fcd93ad1f8a3ad576130 (diff) |
p/fuel: Rebase for os cacert
While rebasing, drop batch apply of linux.network state for VCP nodes,
as it does not fix the underlying problem and only introduces extra
delay.
Reverts commits: 4f1bfdd
Change-Id: I365b029aa2855334e295907cdde623b1717fc69a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0014-mcp-salt-formulas-armband-Extend-libvirt_domain.patch')
-rw-r--r-- | patches/opnfv-fuel/0014-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/opnfv-fuel/0014-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0014-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index c9eca2d1..29cba1b0 100644 --- a/patches/opnfv-fuel/0014-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0014-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -21,10 +21,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/maas b/mcp/config/states/maas -index db0241b..fcb8ce3 100755 +index 3731c31..5e1dca1 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas -@@ -81,7 +81,7 @@ wait_for 90 "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'" +@@ -81,7 +81,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp |