diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-11-20 15:50:53 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-11-28 12:29:47 +0400 |
| commit | 8726a0d7ed8286d1aa86523a4acf61d9d4b4c9cd (patch) | |
| tree | 90830fb977f85da323281ea45d16ab83612e51ff /mcp/scripts/salt.sh | |
| parent | 0cd4332f168052af8887d794b16efa7ba661d509 (diff) | |
[virtual] Update openstack version to pike
Change-Id: I1df0228cb44bf9122aaf93dd25fc16a0d26a5240
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/scripts/salt.sh')
| -rwxr-xr-x | mcp/scripts/salt.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index b719aa8ae..59baaa530 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -17,7 +17,7 @@ F_GIT_SUBD=${F_GIT_ROOT#${F_GIT_DIR%%/.git*}} OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/opnfv" OPNFV_GIT_DIR="/root/opnfv" OPNFV_FUEL_DIR="/root/fuel" -OPNFV_RDIR="reclass/classes/cluster/all-mcp-ocata-common" +OPNFV_RDIR="reclass/classes/cluster/all-mcp-arch-common" OPNFV_VCP_IMG="mcp/scripts/base_image_opnfv_fuel_vcp.img" OPNFV_VCP_DIR="/srv/salt/env/prd/salt/files/control/images" LOCAL_GIT_DIR="${F_GIT_ROOT%${F_GIT_SUBD}}" @@ -107,4 +107,8 @@ 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 -s ocata pike SALT_INSTALL_END |