From d4a32a5737af8f30213075178b3f66a98f7257b1 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 30 Aug 2017 22:06:23 +0200 Subject: 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 --- ...tes-maas-Retry-linux-state-if-no-response.patch | 31 ---------------------- 1 file changed, 31 deletions(-) delete mode 100644 patches/opnfv-fuel/0021-states-maas-Retry-linux-state-if-no-response.patch (limited to 'patches/opnfv-fuel/0021-states-maas-Retry-linux-state-if-no-response.patch') 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 -Date: Tue, 29 Aug 2017 01:21:30 +0200 -Subject: [PATCH] states: maas: Retry linux state if no response - -Signed-off-by: Alexandru Avadanii ---- - 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))" -- cgit 1.2.3-korg