summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-03-07 15:34:22 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-03-07 15:39:46 +0400
commit7c0643b2fa949c993bdc7da4f3dd7a91f8993f8d (patch)
tree8988e5d280426e62305a26d1920485c65053d32c
parent3f63be553d8be68b2dc39dd2813bf5ffef0c3207 (diff)
Clean up aodh formula symlink
Change-Id: I1d84b5d4e3eb0de1c3ebf6fc5a538ee6714d53b2 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
m---------mcp/reclass/classes/system0
-rwxr-xr-xmcp/scripts/salt.sh4
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