summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-01-25 03:08:15 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-01-25 03:23:57 +0100
commit59b095b6688e8b628ede44c282f8699bd21e4c83 (patch)
tree84c5f5a12868a4a1484dcb29b20b32eca1957490
parent0567f7b0762b97a3d96cc02eb23bd2b1db3b4ee8 (diff)
deploy-cache: Fix typo in nailgun settings sed
Previous commit missed adding the "-i" flag to a sed call, rendering the whole effort useless. JIRA: ARMBAND-190 Change-Id: If0724cb99c94530e5eeb140e93759c4a19503908 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch b/patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch
index ae580922..2076dfbb 100644
--- a/patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch
+++ b/patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch
@@ -90,7 +90,7 @@ index 0000000..71eae61
++ if cp "${OPNFV_CACHE_PATH}/id_rsa"* "/root/.ssh/" && \
++ cp "/root/.ssh/id_rsa.pub" "/root/.ssh/authorized_keys" && \
++ cp "/root/.ssh/id_rsa.pub" "/etc/cobbler/authorized_keys" && \
-++ sed "s|\"ssh-rsa .*\"|\"$(cat /root/.ssh/id_rsa.pub)\"|g" \
+++ sed -i -e "s|\"ssh-rsa .*\"|\"$(cat /root/.ssh/id_rsa.pub)\"|g" \
++ /etc/nailgun/settings.yaml && \
++ fuel-bootstrap -v --debug import --activate \
++ "${OPNFV_CACHE_PATH}/${OPNFV_CACHE_TAR}" >>"$bs_build_log" 2>&1; then