aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-15 00:00:04 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-15 00:00:04 +0000
commit9dfa19de4ae2962152c866657c9a2f60f96a1795 (patch)
treee9a472a3dddad490e21a50bf1d91113fbf8c55d9
parente1f66f65ff0a7e401a0b4b5275f915bbaabea128 (diff)
parent7b4dc44ba29c1a09073e6494559254c5069c0e42 (diff)
Merge "salt.sh: Copy mcp.rsa to cfg01"
-rw-r--r--.gitignore1
-rw-r--r--mcp/scripts/.gitignore1
-rwxr-xr-xmcp/scripts/salt.sh1
3 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 49939c146..fe7a86422 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@
**/docs_output/
**/releng/
**/mcp/deploy/images/
-**/mcp/scripts/mcp.rsa*
**/mcp/scripts/user-data.sh
**/mcp/scripts/virsh_net/*.xml
**/mcp/scripts/*.img
diff --git a/mcp/scripts/.gitignore b/mcp/scripts/.gitignore
index 89af7c473..a7f658e4e 100644
--- a/mcp/scripts/.gitignore
+++ b/mcp/scripts/.gitignore
@@ -1,2 +1,3 @@
+mcp.rsa*
user-data.*.sh
xdf_data.sh
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index ad4707369..c5582f16d 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -63,6 +63,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
ln -sf ${OPNFV_GIT_DIR}${F_GIT_SUBD} ${OPNFV_FUEL_DIR}
ln -sf ${OPNFV_FUEL_DIR}/mcp/reclass /srv/salt
ln -sf ${OPNFV_FUEL_DIR}/mcp/deploy/scripts /srv/salt
+ ln -sf ${OPNFV_FUEL_DIR}/mcp/scripts/mcp.rsa $(dirname "${OPNFV_FUEL_DIR}")
cd /srv/salt/${OPNFV_RDIR} && rm -f arch && ln -sf "\$(uname -i)" arch
cp -r ${OPNFV_FUEL_DIR}/mcp/metadata/service /usr/share/salt-formulas/reclass