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 --- .../0022-lib.sh-Reuse-tmp-mcp.rsa-if-present.patch | 33 ---------------------- 1 file changed, 33 deletions(-) delete mode 100644 patches/opnfv-fuel/0022-lib.sh-Reuse-tmp-mcp.rsa-if-present.patch (limited to 'patches/opnfv-fuel/0022-lib.sh-Reuse-tmp-mcp.rsa-if-present.patch') diff --git a/patches/opnfv-fuel/0022-lib.sh-Reuse-tmp-mcp.rsa-if-present.patch b/patches/opnfv-fuel/0022-lib.sh-Reuse-tmp-mcp.rsa-if-present.patch deleted file mode 100644 index 75ea9355..00000000 --- a/patches/opnfv-fuel/0022-lib.sh-Reuse-tmp-mcp.rsa-if-present.patch +++ /dev/null @@ -1,33 +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 02:35:37 +0200 -Subject: [PATCH] lib.sh: Reuse /tmp/mcp.rsa if present - -Signed-off-by: Alexandru Avadanii ---- - mcp/scripts/lib.sh | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index bf8eb12..5389ced 100644 ---- a/mcp/scripts/lib.sh -+++ b/mcp/scripts/lib.sh -@@ -9,6 +9,11 @@ generate_ssh_key() { - user=${SUDO_USER} - fi - -+ if [ -f "/tmp/${SSH_KEY}" ]; then -+ cp "/tmp/${SSH_KEY}" . -+ ssh-keygen -f "${SSH_KEY}" -y > "${SSH_KEY}.pub" -+ fi -+ - [ -f "${SSH_KEY}" ] || ssh-keygen -f "${SSH_KEY}" -N '' - install -o "${user}" -m 0600 "${SSH_KEY}" /tmp/ - } -- cgit 1.2.3-korg