diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-07 16:35:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-07 16:35:36 +0000 |
| commit | 5f0ac8951f2630642f05dd6d06c414a9402db954 (patch) | |
| tree | 913ead026493719842f8510bd1b8cb32be6f02af | |
| parent | 00872d71aba2ac8b8ca7c7c7a5adfd74e8f60d95 (diff) | |
| parent | 7c0643b2fa949c993bdc7da4f3dd7a91f8993f8d (diff) | |
Merge "Clean up aodh formula symlink"
| m--------- | mcp/reclass/classes/system | 0 | ||||
| -rwxr-xr-x | mcp/scripts/salt.sh | 4 |
2 files changed, 0 insertions, 4 deletions
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system -Subproject 20afa5cea210bf6b991dc6ed394d3378bf98c13 +Subproject d9eb865a72f54f14b2ec1de1a70c9e7c645d5fe diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index fc5c78e68..dfeba8fea 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -123,8 +123,4 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END mkdir -p "${OPNFV_VCP_DIR}" mv "${OPNFV_FUEL_DIR}/${OPNFV_VCP_IMG}" "${OPNFV_VCP_DIR}/" fi - - # symlink manually until package with required commit is available - cd /usr/share/salt-formulas/env/aodh/files - ln -sf ocata pike SALT_INSTALL_END |