diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-09-19 11:03:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-19 11:03:09 +0000 |
| commit | beab14192ba234803bf2032af6cf190dfa6b25a8 (patch) | |
| tree | 57e8432d881cacc148df3f98dd1c560bd636f871 | |
| parent | c57d4c9a8e26c7dcb8f9f1b98c5b5d6d668750a3 (diff) | |
| parent | 519def66f241c4a9d0d3ac3aa8bd47484a25188b (diff) | |
Merge "[cleanup] Move default storage dir to /var/lib"
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | ci/deploy.sh | 11 | ||||
| -rw-r--r-- | mcp/deploy/images/.gitkeep | 0 |
3 files changed, 8 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 059072f14..4a787d9b4 100644 --- a/.gitignore +++ b/.gitignore @@ -9,8 +9,6 @@ **/docs_build/ **/docs_output/ **/releng/ -**/mcp/deploy/images/ -**/mcp/scripts/user-data.sh **/mcp/scripts/virsh_net/*.xml **/mcp/scripts/docker-compose/*.yaml **/mcp/scripts/*.img diff --git a/ci/deploy.sh b/ci/deploy.sh index 8baacfab0..4b6b916ac 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -107,7 +107,9 @@ $(notify_i "Input parameters to the build script are:" 2) Note that without the required packages, deploy will fail. -s Deployment-scenario, this points to a short deployment scenario name, which has to be defined in config directory (e.g. os-odl-nofeature-ha). --S Storage dir for VM images, default is mcp/deploy/images +-S Storage dir for VM images, default is /var/lib/opnfv/tmpdir + It is recommended to store the deploy artifacts on a fast disk, outside of + the current git repository (so clean operations won't erase it). $(notify_i "[NOTE] sudo & virsh priviledges are needed for this script to run" 3) @@ -116,7 +118,8 @@ Example: $(notify_i "sudo $(basename "$0") \\ -b file:///home/jenkins/securedlab \\ -l lf -p pod2 \\ - -s os-odl-nofeature-ha" 2) + -s os-odl-nofeature-ha \\ + -S /home/jenkins/tmpdir" 2) EOF } @@ -130,7 +133,7 @@ EOF CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x MCP_REPO_ROOT_PATH=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")/..") DEPLOY_DIR=$(cd "${MCP_REPO_ROOT_PATH}/mcp/scripts"; pwd) -MCP_STORAGE_DIR=$(cd "${MCP_REPO_ROOT_PATH}/mcp/deploy/images"; pwd) +MCP_STORAGE_DIR='/var/lib/opnfv/tmpdir' URI_REGEXP='(file|https?|ftp)://.*' BASE_CONFIG_URI="file://${MCP_REPO_ROOT_PATH}/mcp/scripts/pharos" @@ -242,6 +245,8 @@ pushd "${DEPLOY_DIR}" > /dev/null # scenario, etc. # Install required packages on jump server +sudo mkdir -p "${MCP_STORAGE_DIR}" +sudo chown "${USER}:${USER}" "${MCP_STORAGE_DIR}" if [ ${USE_EXISTING_PKGS} -eq 1 ]; then notify "[NOTE] Skipping distro pkg installation" 2 else diff --git a/mcp/deploy/images/.gitkeep b/mcp/deploy/images/.gitkeep deleted file mode 100644 index e69de29bb..000000000 --- a/mcp/deploy/images/.gitkeep +++ /dev/null |