diff options
Diffstat (limited to 'ci/deploy.sh')
| -rwxr-xr-x | ci/deploy.sh | 210 |
1 files changed, 57 insertions, 153 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 9a22e9ec5..a5fec4d44 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -1,7 +1,7 @@ #!/bin/bash -e -# shellcheck disable=SC2034,SC2154,SC1090,SC1091 +# shellcheck disable=SC2034,SC2154,SC1090,SC1091,SC2155 ############################################################################## -# Copyright (c) 2017 Ericsson AB, Mirantis Inc., Enea AB and others. +# Copyright (c) 2018 Ericsson AB, Mirantis Inc., Enea AB and others. # jonas.bjurel@ericsson.com # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 @@ -16,9 +16,9 @@ do_exit () { local RC=$? cleanup_mounts > /dev/null 2>&1 if [ ${RC} -eq 0 ]; then - notify "\n[OK] MCP: Openstack installation finished succesfully!\n\n" 2 + notify_n "[OK] MCP: Openstack installation finished succesfully!" 2 else - notify "\n[ERROR] MCP: Openstack installation threw a fatal error!\n\n" + notify_n "[ERROR] MCP: Openstack installation threw a fatal error!" fi } # @@ -38,7 +38,7 @@ $(notify "USAGE:" 2) $(basename "$0") -l lab-name -p pod-name -s deploy-scenario \\ [-b Lab Config Base URI] \\ [-S storage-dir] [-L /path/to/log/file.tar.gz] \\ - [-f[f]] [-F] [-e | -E[E]] [-d] [-D] + [-f[f]] [-F] [-e | -E[E]] [-d] [-D] [-N] $(notify "OPTIONS:" 2) -b Base-uri for the stack-configuration structure @@ -55,25 +55,26 @@ $(notify "OPTIONS:" 2) -s Deploy-scenario short-name -S Storage dir for VM images -L Deployment log path and file name + -N Experimental: Do not virtualize control plane (novcp) -$(notify "Description:" 2) +$(notify_i "Description:" 2) Deploys the Fuel@OPNFV stack on the indicated lab resource. This script provides the Fuel@OPNFV deployment abstraction. It depends on the OPNFV official configuration directory/file structure and provides a fairly simple mechanism to execute a deployment. -$(notify "Input parameters to the build script are:" 2) +$(notify_i "Input parameters to the build script are:" 2) -b Base URI to the configuration directory (needs to be provided in URI style, it can be a local resource: file:// or a remote resource http(s)://). A POD Descriptor File (PDF) and its Installer Descriptor File (IDF) companion should be available at: <base-uri>/labs/<lab-name>/<pod-name>.yaml <base-uri>/labs/<lab-name>/idf-<pod-name>.yaml - An example config is provided inside current repo in - <./mcp/config>. The default is using the git submodule tracking 'OPNFV Pharos' in <./mcp/scripts/pharos>. + An example config is provided inside current repo in + <./mcp/config>, automatically linked as <./mcp/scripts/pharos/labs/local>. -d Dry-run - Produce deploy config files, but do not execute deploy -D Debug logging - Enable extra logging in sh deploy scripts (set -x) -e Do not launch environment deployment @@ -90,6 +91,8 @@ $(notify "Input parameters to the build script are:" 2) -L Deployment log path and name, eg. -L /home/jenkins/job.log.tar.gz -l Lab name as defined in the configuration directory, e.g. lf -p POD name as defined in the configuration directory, e.g. pod2 +-N Experimental: Instead of virtualizing the control plane (VCP), deploy + control plane directly on baremetal nodes -P Skip installing dependency distro packages on current host This flag should only be used if you have kept back older packages that would be upgraded and that is undesirable on the current system. @@ -98,11 +101,11 @@ $(notify "Input parameters to the build script are:" 2) has to be defined in config directory (e.g. os-odl-nofeature-ha). -S Storage dir for VM images, default is mcp/deploy/images -$(notify "[NOTE] sudo & virsh priviledges are needed for this script to run" 3) +$(notify_i "[NOTE] sudo & virsh priviledges are needed for this script to run" 3) Example: -$(notify "sudo $(basename "$0") \\ +$(notify_i "sudo $(basename "$0") \\ -b file:///home/jenkins/securedlab \\ -l lf -p pod2 \\ -s os-odl-nofeature-ha" 2) @@ -114,28 +117,12 @@ EOF ############################################################################## ############################################################################## -# BEGIN of colored notification wrapper -# -notify() { - tput setaf "${2:-1}" || true - echo -en "${1:-"[WARN] Unsupported opt arg: $3\\n"}" - tput sgr0 -} -# -# END of colored notification wrapper -############################################################################## - -############################################################################## # BEGIN of variables to customize # CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x REPO_ROOT_PATH=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")/..") DEPLOY_DIR=$(cd "${REPO_ROOT_PATH}/mcp/scripts"; pwd) STORAGE_DIR=$(cd "${REPO_ROOT_PATH}/mcp/deploy/images"; pwd) -RECLASS_CLUSTER_DIR=$(cd "${REPO_ROOT_PATH}/mcp/reclass/classes/cluster"; pwd) -DEPLOY_TYPE='baremetal' -BR_NAMES=('admin' 'mgmt' 'private' 'public') -OPNFV_BRIDGES=('pxebr' 'mgmt' 'internal' 'public') URI_REGEXP='(file|https?|ftp)://.*' BASE_CONFIG_URI="file://${REPO_ROOT_PATH}/mcp/scripts/pharos" @@ -146,9 +133,11 @@ USE_EXISTING_INFRA=${USE_EXISTING_INFRA:-0} INFRA_CREATION_ONLY=${INFRA_CREATION_ONLY:-0} NO_DEPLOY_ENVIRONMENT=${NO_DEPLOY_ENVIRONMENT:-0} ERASE_ENV=${ERASE_ENV:-0} +MCP_VCP=${MCP_VCP:-1} source "${DEPLOY_DIR}/globals.sh" source "${DEPLOY_DIR}/lib.sh" +source "${DEPLOY_DIR}/lib_template.sh" # # END of variables to customize @@ -158,13 +147,13 @@ source "${DEPLOY_DIR}/lib.sh" # BEGIN of main # set +x -while getopts "b:dDfEFl:L:p:Ps:S:he" OPTION +while getopts "b:dDfEFl:L:Np:Ps:S:he" OPTION do case $OPTION in b) BASE_CONFIG_URI=${OPTARG} if [[ ! $BASE_CONFIG_URI =~ ${URI_REGEXP} ]]; then - notify "[ERROR] -b $BASE_CONFIG_URI - invalid URI\n" + notify "[ERROR] -b $BASE_CONFIG_URI - invalid URI" usage exit 1 fi @@ -193,10 +182,15 @@ do L) DEPLOY_LOG="${OPTARG}" ;; + N) + MCP_VCP=0 + ;; p) TARGET_POD=${OPTARG} - if [[ "${TARGET_POD}" =~ "virtual" ]]; then - DEPLOY_TYPE='virtual' + if [[ "${TARGET_POD}" =~ virtual ]]; then + # All vPODs will use 'local-virtual1' PDF/IDF for now + TARGET_LAB='local' + TARGET_POD='virtual1' fi ;; P) @@ -215,23 +209,20 @@ do exit 0 ;; *) - notify "[ERROR] Arguments not according to new argument style\n" - exit 1 + notify_e "[ERROR] Unsupported arg, see -h for help" ;; esac done if [[ "$(sudo whoami)" != 'root' ]]; then - notify "[ERROR] This script requires sudo rights\n" 1>&2 - exit 1 + notify_e "[ERROR] This script requires sudo rights" fi # Validate mandatory arguments are set if [ -z "${TARGET_LAB}" ] || [ -z "${TARGET_POD}" ] || \ [ -z "${DEPLOY_SCENARIO}" ]; then - notify "[ERROR] At least one of the mandatory args is missing!\n" 1>&2 usage - exit 1 + notify_e "[ERROR] At least one of the mandatory args is missing!" fi [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x @@ -248,26 +239,14 @@ pushd "${DEPLOY_DIR}" > /dev/null # Install required packages on jump server if [ ${USE_EXISTING_PKGS} -eq 1 ]; then - notify "[NOTE] Skipping distro pkg installation\n" 2 1>&2 + notify "[NOTE] Skipping distro pkg installation" 2 else - notify "[NOTE] Installing required distro pkgs\n" 2 1>&2 - if [ -n "$(command -v apt-get)" ]; then - pkg_type='deb'; pkg_cmd='sudo apt-get install -y' - else - pkg_type='rpm'; pkg_cmd='sudo yum install -y --skip-broken' - fi - eval "$(parse_yaml "./requirements_${pkg_type}.yaml")" - for section in 'common' "${DEPLOY_TYPE}" "$(uname -m)"; do - section_var="requirements_pkg_${section}[*]" - pkg_list+=" ${!section_var}" - done - # shellcheck disable=SC2086 - ${pkg_cmd} ${pkg_list} + notify "[NOTE] Installing required distro pkgs" 2 + jumpserver_pkg_install fi if ! virsh list >/dev/null 2>&1; then - notify "[ERROR] This script requires hypervisor access\n" 1>&2 - exit 1 + notify_e "[ERROR] This script requires hypervisor access" fi # Collect jump server system information for deploy debugging @@ -276,116 +255,41 @@ fi # Clone git submodules and apply our patches make -C "${REPO_ROOT_PATH}/mcp/patches" deepclean patches-import -# Convert Pharos-compatible POD Descriptor File (PDF) to reclass model input -PHAROS_GEN_CONFIG_SCRIPT="./pharos/config/utils/generate_config.py" -PHAROS_INSTALLER_ADAPTER="./pharos/config/installers/fuel/pod_config.yml.j2" -BASE_CONFIG_PDF="${BASE_CONFIG_URI}/labs/${TARGET_LAB}/${TARGET_POD}.yaml" -BASE_CONFIG_IDF="${BASE_CONFIG_URI}/labs/${TARGET_LAB}/idf-${TARGET_POD}.yaml" -LOCAL_PDF="${STORAGE_DIR}/$(basename "${BASE_CONFIG_PDF}")" -LOCAL_IDF="${STORAGE_DIR}/$(basename "${BASE_CONFIG_IDF}")" -LOCAL_PDF_RECLASS="${STORAGE_DIR}/pod_config.yml" -if ! curl --create-dirs -o "${LOCAL_PDF}" "${BASE_CONFIG_PDF}"; then - if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then - notify "[ERROR] Could not retrieve PDF (Pod Descriptor File)!\n" 1>&2 - exit 1 - else - notify "[WARN] Could not retrieve PDF (Pod Descriptor File)!\n" 3 - fi -elif ! curl -o "${LOCAL_IDF}" "${BASE_CONFIG_IDF}"; then - notify "[WARN] POD has no IDF (Installer Descriptor File)!\n" 3 -elif ! "${PHAROS_GEN_CONFIG_SCRIPT}" -y "${LOCAL_PDF}" \ - -j "${PHAROS_INSTALLER_ADAPTER}" > "${LOCAL_PDF_RECLASS}"; then - notify "[ERROR] Could not convert PDF to reclass model input!\n" 1>&2 - exit 1 -fi - # Check scenario file existence -SCENARIO_DIR="../config/scenario" -if [ ! -f "${SCENARIO_DIR}/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml" ]; then - notify "[ERROR] Scenario definition file is missing!\n" 1>&2 - exit 1 +SCENARIO_DIR="$(readlink -f "../config/scenario")" +if [ ! -f "${SCENARIO_DIR}/${DEPLOY_SCENARIO}.yaml" ] && \ + [ ! -f "${SCENARIO_DIR}/${DEPLOY_SCENARIO}.yaml.j2" ]; then + notify_e "[ERROR] Scenario definition file is missing!" fi -# Check defaults file existence -if [ ! -f "${SCENARIO_DIR}/defaults-$(uname -i).yaml" ]; then - notify "[ERROR] Scenario defaults file is missing!\n" 1>&2 - exit 1 -fi +# key might not exist yet ... +generate_ssh_key +export MAAS_SSH_KEY="$(cat "$(basename "${SSH_KEY}").pub")" -# Get required infra deployment data -set +x -eval "$(parse_yaml "${SCENARIO_DIR}/defaults-$(uname -i).yaml")" -eval "$(parse_yaml "${SCENARIO_DIR}/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml")" -eval "$(parse_yaml "${LOCAL_PDF_RECLASS}")" -[[ "${CI_DEBUG}" =~ (false|0) ]] || set -x - -export CLUSTER_DOMAIN=${cluster_domain} - -# Serialize vnode data as '<name0>,<ram0>,<vcpu0>|<name1>,<ram1>,<vcpu1>[...]' -for node in "${virtual_nodes[@]}"; do - virtual_custom_ram="virtual_${node}_ram" - virtual_custom_vcpus="virtual_${node}_vcpus" - virtual_nodes_data+="${node}," - virtual_nodes_data+="${!virtual_custom_ram:-$virtual_default_ram}," - virtual_nodes_data+="${!virtual_custom_vcpus:-$virtual_default_vcpus}|" -done -virtual_nodes_data=${virtual_nodes_data%|} - -# Serialize repos, packages to (pre-)install/remove for: -# - foundation node VM base image (virtual: all VMs, baremetal: cfg01|mas01) -# - virtualized control plane VM base image (only when VCP is used) -base_image_flavors=common -if [[ "${cluster_states[*]}" =~ virtual_control ]]; then - base_image_flavors+=" control" -fi -for sc in ${base_image_flavors}; do - for va in apt_keys apt_repos pkg_install pkg_remove; do - key=virtual_${sc}_${va} - eval "${key}=\${${key}[@]// /|}" - eval "${key}=\${${key}// /,}" - virtual_repos_pkgs+="${!key}^" - done -done -virtual_repos_pkgs=${virtual_repos_pkgs%^} - -# Expand reclass and virsh network templates -for tp in "${RECLASS_CLUSTER_DIR}/all-mcp-arch-common/opnfv/"*.template \ - net_*.template; do - eval "cat <<-EOF - $(<"${tp}") - EOF" 2> /dev/null > "${tp%.template}" -done +# Expand jinja2 templates based on PDF data and env vars +export MCP_VCP MCP_JUMP_ARCH=$(uname -i) +do_templates_scenario "${STORAGE_DIR}" "${TARGET_LAB}" "${TARGET_POD}" \ + "${BASE_CONFIG_URI}" "${SCENARIO_DIR}" +do_templates_cluster "${STORAGE_DIR}" "${TARGET_LAB}" "${TARGET_POD}" \ + "${REPO_ROOT_PATH}" \ + "${SCENARIO_DIR}/defaults.yaml" \ + "${SCENARIO_DIR}/${DEPLOY_SCENARIO}.yaml" -# Convert Pharos-compatible PDF to reclass network definitions -if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then - find "${RECLASS_CLUSTER_DIR}" -name '*.j2' | while read -r tp - do - if ! "${PHAROS_GEN_CONFIG_SCRIPT}" -y "${LOCAL_PDF}" \ - -j "${tp}" > "${tp%.j2}"; then - notify "[ERROR] Could not convert PDF to reclass network defs!\n" - exit 1 - fi - done -fi +# Determine additional data (e.g. jump bridge names) based on XDF +source "${DEPLOY_DIR}/xdf_data.sh" -# Determine 'admin', 'mgmt', 'private' and 'public' bridge names based on IDF -for ((i = 0; i < ${#BR_NAMES[@]}; i++)); do - br_jump=$(eval echo "\$parameters__param_opnfv_jump_bridge_${BR_NAMES[i]}") - if [ -n "${br_jump}" ] && [ "${br_jump}" != 'None' ]; then - OPNFV_BRIDGES[${i}]="${br_jump}" - fi -done -notify "[NOTE] Using bridges: ${OPNFV_BRIDGES[*]}\n" 2 +# Jumpserver prerequisites check +notify "[NOTE] Using bridges: ${OPNFV_BRIDGES[*]}" 2 +jumpserver_check_requirements "${virtual_nodes[*]}" "${OPNFV_BRIDGES[@]}" # Infra setup if [ ${DRY_RUN} -eq 1 ]; then - notify "[NOTE] Dry run, skipping all deployment tasks\n" 2 1>&2 + notify "[NOTE] Dry run, skipping all deployment tasks" 2 exit 0 elif [ ${USE_EXISTING_INFRA} -gt 0 ]; then - notify "[NOTE] Use existing infra\n" 2 1>&2 + notify "[NOTE] Use existing infra" 2 check_connection else - generate_ssh_key prepare_vms "${base_image}" "${STORAGE_DIR}" "${virtual_repos_pkgs}" \ "${virtual_nodes[@]}" create_networks "${OPNFV_BRIDGES[@]}" @@ -396,16 +300,16 @@ else check_connection fi if [ ${USE_EXISTING_INFRA} -lt 2 ]; then - wait_for 5 "./salt.sh ${LOCAL_PDF_RECLASS}" + wait_for 5 "./salt.sh ${STORAGE_DIR}/pod_config.yml ${virtual_nodes[*]}" fi # Openstack cluster setup set +x if [ ${INFRA_CREATION_ONLY} -eq 1 ] || [ ${NO_DEPLOY_ENVIRONMENT} -eq 1 ]; then - notify "[NOTE] Skip openstack cluster setup\n" 2 + notify "[NOTE] Skip openstack cluster setup" 2 else for state in "${cluster_states[@]}"; do - notify "[STATE] Applying state: ${state}\n" 2 + notify "[STATE] Applying state: ${state}" 2 # shellcheck disable=SC2086,2029 wait_for 5 "ssh ${SSH_OPTS} ${SSH_SALT} sudo \ CI_DEBUG=$CI_DEBUG ERASE_ENV=$ERASE_ENV \ |