diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-31 19:38:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-31 19:38:48 +0000 |
| commit | 81c74a3da29cabc3fe76d3b5467378d84fd2767e (patch) | |
| tree | b4c96b74e30e1c47b64b9ffc432e42d95f1cd477 | |
| parent | 1201b3cc9d52e30d1c19e725d943b2826e3a384c (diff) | |
| parent | 0d2b3baea025895737f970f37c3f5d723d201f8e (diff) | |
Merge "mcp/deploy/scripts: Move to git submodule"
| -rw-r--r-- | .gitmodules | 4 | ||||
| m--------- | mcp/deploy/scripts | 0 | ||||
| -rwxr-xr-x | mcp/scripts/salt.sh | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index 7a41f7523..d3ffb555b 100644 --- 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 +Subproject 4c9818260372459977be1cc4a3869b871ddba0a diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 9f88f1c77..b291b0f7c 100755 --- 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 |