diff options
Diffstat (limited to 'mcp/scripts')
| -rw-r--r-- | mcp/scripts/lib.sh | 4 | ||||
| -rwxr-xr-x | mcp/scripts/salt.sh | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 96f189101..3dee9c51f 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -281,9 +281,9 @@ function update_mcpcontrol_network { local cmac=$(virsh domiflist cfg01 2>&1| awk '/mcpcontrol/ {print $5; exit}') local amac=$(virsh domiflist mas01 2>&1| awk '/mcpcontrol/ {print $5; exit}') virsh net-update "mcpcontrol" add ip-dhcp-host \ - "<host mac='${cmac}' name='cfg01' ip='${SALT_MASTER}'/>" --live + "<host mac='${cmac}' name='cfg01' ip='${SALT_MASTER}'/>" --live --config [ -z "${amac}" ] || virsh net-update "mcpcontrol" add ip-dhcp-host \ - "<host mac='${amac}' name='mas01' ip='${MAAS_IP}'/>" --live + "<host mac='${amac}' name='mas01' ip='${MAAS_IP}'/>" --live --config } function start_vms { diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index b719aa8ae..25eb0ede8 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 -sf ocata pike SALT_INSTALL_END |