diff options
author | Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-08-30 14:24:05 +0400 |
---|---|---|
committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-08-30 14:24:05 +0400 |
commit | 476fd41a6200ba17bfd30719b62ed5e07075c77d (patch) | |
tree | 383b472ea30f8b4824fdc4acdfc2ce3f8241825e | |
parent | 7a38c0d5f2b544bea0b5bcf755747f1fd04e5814 (diff) |
Update salt init scripts source
Change-Id: I269e397b78d55794b1c49bf582cc0e663cbe9ca6
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
m--------- | mcp/reclass/classes/system | 0 | ||||
-rwxr-xr-x | mcp/scripts/salt.sh | 5 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system -Subproject 3cb78359189257d125dbec215ac57ecbf335abc +Subproject 02926007d5db81e0358f63d7ae3c9c28eb17dd8 diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 36ee27b89..9f88f1c77 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -34,10 +34,9 @@ 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 subversion + DEBIAN_FRONTEND=noninteractive apt-get install -y git curl - svn export --force \ - https://github.com/salt-formulas/salt-formulas/trunk/deploy/scripts /srv/salt/scripts + git clone --depth=1 https://github.com/salt-formulas/salt-formulas-scripts /srv/salt/scripts mv ${OPNFV_TMP_DIR} ${OPNFV_FUEL_DIR} && chown -R root.root ${OPNFV_FUEL_DIR} ln -s ${OPNFV_FUEL_DIR}/mcp/reclass /srv/salt/reclass |