mcp/deploy/scripts: Move to git submodule

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

diff --git a/.gitmodules b/.gitmodules
index 7a41f75..d3ffb55 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,3 +3,7 @@
        url = https://github.com/Mirantis/reclass-system-salt-model
        branch = master
         ignore = all
+[submodule "scripts"]
+       path = mcp/deploy/scripts
+       url = https://github.com/salt-formulas/salt-formulas-scripts
+       branch = master

diff --git a/mcp/deploy/scripts b/mcp/deploy/scripts
new file mode 160000 (submodule)
index 0000000..4c98182
--- /dev/null
+++ b/mcp/deploy/scripts
@@ -0,0 +1 @@
+Subproject commit 4c9818260372459977be1cc4a3869b871ddba0aa

diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 9f88f1c..b291b0f 100755 (executable)
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -34,13 +34,11 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END
   while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo -n '.'; sleep 1; done
   echo ' done'
 
-  DEBIAN_FRONTEND=noninteractive apt-get install -y git curl
-
-  git clone --depth=1 https://github.com/salt-formulas/salt-formulas-scripts /srv/salt/scripts
+  mkdir -p /srv/salt /usr/share/salt-formulas/reclass
   mv ${OPNFV_TMP_DIR} ${OPNFV_FUEL_DIR} && chown -R root.root ${OPNFV_FUEL_DIR}
   ln -s ${OPNFV_FUEL_DIR}/mcp/reclass /srv/salt/reclass
+  ln -s ${OPNFV_FUEL_DIR}/mcp/deploy/scripts /srv/salt/scripts
 
-  mkdir -p /usr/share/salt-formulas/reclass
   cp -r ${OPNFV_FUEL_DIR}/mcp/metadata/service /usr/share/salt-formulas/reclass
   cd /srv/salt/reclass/classes/service && \
     ln -s /usr/share/salt-formulas/reclass/service/opendaylight