Code Review / fuel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 3f63be5)
Clean up aodh formula symlink 31/53231/1
authorMichael Polenchuk <mpolenchuk@mirantis.com>
Wed, 7 Mar 2018 11:34:22 +0000 (15:34 +0400)
committerMichael Polenchuk <mpolenchuk@mirantis.com>
Wed, 7 Mar 2018 11:39:46 +0000 (15:39 +0400)
Change-Id: I1d84b5d4e3eb0de1c3ebf6fc5a538ee6714d53b2
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
mcp/reclass/classes/system patch | blob | history
mcp/scripts/salt.sh patch | blob | history

diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
index 20afa5c..d9eb865 160000 (submodule)
--- a/mcp/reclass/classes/system
+++ b/mcp/reclass/classes/system
@@ -1 +1 @@
-Subproject commit 20afa5cea210bf6b991dc6ed394d3378bf98c130
+Subproject commit d9eb865a72f54f14b2ec1de1a70c9e7c645d5feb
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index fc5c78e..dfeba8f 100755 (executable)
--- 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