aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0021-states-maas-Retry-linux-state-if-no-response.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-30 22:06:23 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-30 22:16:33 +0200
commitd4a32a5737af8f30213075178b3f66a98f7257b1 (patch)
tree43fe9b5be4f1766e3032bb8e442035fc87d30fb3 /patches/opnfv-fuel/0021-states-maas-Retry-linux-state-if-no-response.patch
parentd07736d25fa29b1b45e00750568959bc00a2ee09 (diff)
u/fuel: Bump & rebase for salt scripts new repo
While at it, drop patch that removes UCA repo in ODL scenario and replace it with a patch that extends arch list for UCA repo for arm64. JIRA: ARMBAND-304 Change-Id: Icd8e4cf8288c3e42915244f40d261ff463f60452 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0021-states-maas-Retry-linux-state-if-no-response.patch')
-rw-r--r--patches/opnfv-fuel/0021-states-maas-Retry-linux-state-if-no-response.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/patches/opnfv-fuel/0021-states-maas-Retry-linux-state-if-no-response.patch b/patches/opnfv-fuel/0021-states-maas-Retry-linux-state-if-no-response.patch
deleted file mode 100644
index d7fcb429..00000000
--- a/patches/opnfv-fuel/0021-states-maas-Retry-linux-state-if-no-response.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 29 Aug 2017 01:21:30 +0200
-Subject: [PATCH] states: maas: Retry linux state if no response
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- mcp/config/states/maas | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/mcp/config/states/maas b/mcp/config/states/maas
-index 9e0093b..c54225d 100755
---- a/mcp/config/states/maas
-+++ b/mcp/config/states/maas
-@@ -104,7 +104,8 @@ done
-
- wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"
- wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply salt"
--wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp"
-+wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp | " \
-+ "tee /dev/stderr | fgrep -q 'Not connected'"
-
- wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
- $(awk 'NR==1{print $2}' $(eval echo ~${SUDO_USER}/.ssh/authorized_keys))"