diff options
| author |   Yury Kylulin <yury.kylulin@intel.com> | 2020-06-03 14:04:25 +0000 |
|---|---|---|
| committer | Yury Kylulin <yury.kylulin@intel.com> | 2020-06-03 14:04:25 +0000 |
| commit | 5efcdda3cc2d4e0333cce4a872ae3de4d3e3710b (patch) | |
| tree | 54629f441ccbcf4ca84c9f2ba636c08dc2b252e5 /VNFs/DPPD-PROX | |
| parent | 7e14b29cb65ef871bbc320e1e35e8f4e0b36a8ed (diff) | |
Fix for containers to use /opt/rapid
Fix scripts and build procedure to use /opt/rapid as a main directory for
binaries and config files.
Signed-off-by: Yury Kylulin <yury.kylulin@intel.com>
Change-Id: Icb38c37a85a78a6f2de2e751df5fafd624b4f1b3
Diffstat (limited to 'VNFs/DPPD-PROX')
5 files changed, 12 insertions, 10 deletions
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/Dockerfile b/VNFs/DPPD-PROX/helper-scripts/rapid/Dockerfile index 9f2161fe..c4a4b063 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/Dockerfile +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/Dockerfile @@ -37,7 +37,7 @@ ARG BUILD_DIR=/opt/rapid COPY ./deploycentostools.sh ${BUILD_DIR}/ COPY --from=builder ${BUILD_DIR}/install_components.tgz ${BUILD_DIR}/install_components.tgz -RUN chmod +x ${BUILD_DIR}/deploycentostools.sh \ +RUN chmod a+rwx ${BUILD_DIR} && chmod +x ${BUILD_DIR}/deploycentostools.sh \ && ${BUILD_DIR}/deploycentostools.sh -k runtime_image # Expose SSH and PROX ports diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh index 345b0811..0a1a2923 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh @@ -199,16 +199,16 @@ function port_info_build() pushd ${BUILD_DIR}/port_info > /dev/null 2>&1 make - ${SUDO} cp ${BUILD_DIR}/port_info/build/app/port_info ${HOME}/port_info + ${SUDO} cp ${BUILD_DIR}/port_info/build/app/port_info_app ${BUILD_DIR}/port_info_app popd > /dev/null 2>&1 } function create_minimal_install() { - ldd ${HOME}/prox | awk '{ if ($(NF-1) != "=>") print $(NF-1) }' >> ${BUILD_DIR}/list_of_install_components + ldd ${BUILD_DIR}/prox | awk '{ if ($(NF-1) != "=>") print $(NF-1) }' >> ${BUILD_DIR}/list_of_install_components - echo "${HOME}/prox" >> ${BUILD_DIR}/list_of_install_components - echo "${HOME}/port_info" >> ${BUILD_DIR}/list_of_install_components + echo "${BUILD_DIR}/prox" >> ${BUILD_DIR}/list_of_install_components + echo "${BUILD_DIR}/port_info_app" >> ${BUILD_DIR}/list_of_install_components tar -czvhf ${BUILD_DIR}/install_components.tgz -T ${BUILD_DIR}/list_of_install_components } diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/dockerimage.sh b/VNFs/DPPD-PROX/helper-scripts/rapid/dockerimage.sh index 3d77aaed..e0f38ade 100755 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/dockerimage.sh +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/dockerimage.sh @@ -24,12 +24,14 @@ DOCKER_REGISTRY="localhost:5000" USE_DOCKER_CACHE="n" +IMAGE_BUILD_LOG="dockerimage-build.log" + function create_ssh_key() { if [ -f ./${RSA_KEY_FILE_NAME} ]; then read -p "RSA key already exist! Do you want to remove it (yYnN)?" -n 1 -r - if [ "$REPLY" == "y" ] || [ "$REPLY" == "Y" ]; then + if [ "${REPLY}" == "y" ] || [ "${REPLY}" == "Y" ]; then echo "Removing existing key..." sleep 3 @@ -49,10 +51,10 @@ function build_prox_image() { if [ "${USE_DOCKER_CACHE}" == "y" ]; then echo "Building image using cache..." - docker build --rm -t ${PROX_IMAGE_NAME}:latest -f ${DOCKERFILE} ${PROX_DEPLOY_DIR} + docker build --rm -t ${PROX_IMAGE_NAME}:latest -f ${DOCKERFILE} ${PROX_DEPLOY_DIR} 2>&1 | tee ./${IMAGE_BUILD_LOG} else echo "Building image without cache..." - docker build --no-cache --rm -t ${PROX_IMAGE_NAME}:latest -f ${DOCKERFILE} ${PROX_DEPLOY_DIR} + docker build --no-cache --rm -t ${PROX_IMAGE_NAME}:latest -f ${DOCKERFILE} ${PROX_DEPLOY_DIR} 2>&1 | tee ./${IMAGE_BUILD_LOG} fi } diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/pod.py b/VNFs/DPPD-PROX/helper-scripts/rapid/pod.py index 359523af..fdcb6a4b 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/pod.py +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/pod.py @@ -167,7 +167,7 @@ class Pod: self._log.debug("Using first SRIOV VF %s" % self._sriov_vf) self._log.info("Getting MAC address for assigned SRIOV VF %s" % self._sriov_vf) - self._ssh_client.run_cmd("sudo /home/centos/port_info -n 4 -w %s" % self._sriov_vf) + self._ssh_client.run_cmd("sudo /opt/rapid/port_info_app -n 4 -w %s" % self._sriov_vf) if ret != 0: self._log.error("Failed to get MAC address!" "Error %s" % self._ssh_client.get_error()) diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/port_info/Makefile b/VNFs/DPPD-PROX/helper-scripts/rapid/port_info/Makefile index 39ebd354..f91cf156 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/port_info/Makefile +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/port_info/Makefile @@ -24,7 +24,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk # binary name -APP = port_info +APP = port_info_app # all source are stored in SRCS-y SRCS-y := port_info.c |