From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 13 Mar 2018 20:31:53 +0000 (+0100)
Subject: salt.sh: Copy mcp.rsa to cfg01
X-Git-Tag: opnfv-6.0.0~35^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F53725%2F1;p=fuel.git

salt.sh: Copy mcp.rsa to cfg01

- let rsync transfer mcp.rsa* to cfg01;
- symlink mcp.rsa in /root;

Change-Id: I18cb70306faf9d166e1110e374a9fe16ac4449de
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

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