diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/README.rst | 149 | ||||
| -rwxr-xr-x | ci/build.sh | 107 | ||||
| -rwxr-xr-x | ci/deploy.sh | 162 |
3 files changed, 285 insertions, 133 deletions
diff --git a/ci/README.rst b/ci/README.rst index dc860c003..c25c58f11 100644 --- a/ci/README.rst +++ b/ci/README.rst @@ -4,99 +4,100 @@ Abstract ======== -The fuel/ci directory holds all Fuel@OPNFV programatic abstractions for -the OPNFV community release and continous integration pipeline. -There is now only one Fuel@OPNFV autonomous script for this, complying to the + +The ``ci`` directory holds all OPNFV Fuel programatic abstractions for +the OPNFV community release and continuous integration pipeline. +There are now two OPNFV Fuel autonomous scripts for this, complying to the OPNFV CI pipeline guideline: - - deploy.sh -USAGE +- ``build.sh`` +- ``deploy.sh`` + +Usage ===== -For usage information of the CI/CD scripts, please run: - .. code-block:: bash +For usage information of the CI/CD deploy script, please run: - $ ./deploy.sh -h +.. code-block:: console -Details on the CI/CD deployment framework + jenkins@jumpserver:~/fuel/ci$ ./deploy.sh -h + +Details on the CI/CD Deployment Framework ========================================= -Overview and purpose +Overview and Purpose -------------------- -The CI/CD deployment script relies on a configuration structure, providing base -installer configuration (part of fuel repo: mcp/config), per POD specific -configuration (part of a separate classified POD configuration repo: securedlab -and deployment scenario configuration (part of fuel repo: mcp/config/scenario). -- The base installer configuration resembles the least common denominator of all +The CI/CD deployment script relies on a configuration structure, providing: + +- per POD specific configuration (defaults to using Pharos OPNFV project + ``PDF``/``IDF`` files for all OPNFV CI PODs). + Pharos OPNFV git repository is included as a git submodule at + ``mcp/scripts/pharos``. + Optionally, a custom configuration structure can be used via the ``-b`` + deploy argument. + The POD specific parameters follow the ``PDF``/``IDF`` formats defined by + the Pharos OPNFV project. +- deployment scenario configuration, part of fuel repo: ``mcp/config/scenario``. + Provides a high level, POD/HW environment independent scenario configuration + for a specific deployment. It defines what features shall be deployed - as + well as needed overrides of the base installer, POD/HW environment + configurations. Objects allowed to override are governed by the OPNFV Fuel + project. +- base installer configuration, part of fuel repo: ``mcp/config/states``, + ``mcp/reclass``. + The base installer configuration resembles the least common denominator of all HW/POD environment and deployment scenarios. These configurations are - normally carried by the the installer projects in this case (Fuel@OPNFV). -- Per POD specific configuration specifies POD unique parameters, the POD - parameter possible to alter is governed by the Fuel@OPNFV project. -- Deployment scenario configuration - provides a high level, POD/HW environment - independent scenario configuration for a specifiv deployment. It defines what - features shall be deployed - as well needed overrides of the base - installer, POD/HW environment configurations. Objects allowed to override - are governed by the Fuel@OPNFV project. - -Executing a deployment + normally carried by the the installer projects in this case (OPNFV Fuel). + +Executing a Deployment ---------------------- -deploy.sh must be executed locally at the target lab/pod/jumpserver + +``deploy.sh`` must be executed locally on the target lab/pod/jumpserver. A configuration structure must be provided - see the section below. It is straight forward to execute a deployment task - as an example: - .. code-block:: bash +.. code-block:: console + + jenkins@jumpserver:~/fuel/ci$ ./deploy.sh -b file:///home/jenkins/config \ + -l lf \ + -p pod2 \ + -s os-nosdn-nofeature-ha - $ sudo deploy.sh -b file:///home/jenkins/config - -l lf -p pod2 -s os-nosdn-nofeature-ha +``-b`` argument should be expressed in URI style (eg: ``file://...`` or +``http://...``). The resources can thus be local or remote. --b and -i arguments should be expressed in URI style (eg: file://... -or http://...). The resources can thus be local or remote. +If ``-b`` is not used, the Pharos OPNFV project git submodule local path URI +is used for the default configuration structure. -Configuration repository structure +Configuration Repository Structure ---------------------------------- + The CI deployment engine relies on a configuration directory/file structure -pointed to by the -b option described above. -Normally this points to the secure classified OPNFV securedlab repo to which -only jenkins and andmins have access to, but you may point to any local or -remote strcture fullfilling the diectory/file structure below. -The reason that this configuration structure needs to be secure/hidden -is that there are security sensitive information in the various configuration -files. - -FIXME: Below information is out of date and should be refreshed after PDF -support is fully implemented. - -A local stripped version of this configuration structure with virtual -deployment configurations also exist under build/config/. +pointed to by the ``-b`` option described above. +Normally this points to the ``mcp/scripts/pharos`` git repo submodule, but you +may point to any local or remote strcture fullfilling the diectory/file +structure below. +This configuration structure supports optional encryption of certain security +sensitive data, mechanism described in the Pharos documentation. + Following configuration directory and file structure should adheare to: - .. code-block:: bash - - TOP - ! - +---- labs - ! - +---- lab-name-1 - ! ! - ! +---- pod-name-1 - ! ! ! - ! ! +---- fuel - ! ! ! - ! ! +---- config - ! ! ! - ! ! +---- dea-pod-override.yaml - ! ! ! - ! ! +---- dha.yaml - ! ! - ! +---- pod-name-2 - ! ! - ! - +---- lab-name-2 - ! ! - - -Creating a deployment scenario ------------------------------- -Please find `mcp/config/README.rst` for instructions on how to create a new -deployment scenario. +.. code-block:: console + + TOP + ! + +---- labs + ! + +---- lab-name-1 + ! ! + ! +---- pod1.yaml + ! ! + ! +---- idf-pod1.yaml + ! ! + ! +---- pod2.yaml + ! ! + ! +---- idf-pod2.yaml + ! + +---- lab-name-2 + ! ! diff --git a/ci/build.sh b/ci/build.sh new file mode 100755 index 000000000..3da67053b --- /dev/null +++ b/ci/build.sh @@ -0,0 +1,107 @@ +#!/bin/bash -e +# shellcheck disable=SC1004,SC1090 +############################################################################## +# Copyright (c) 2018 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +############################################################################## +# BEGIN of Exit handlers +# +do_exit () { + local RC=$? + if [ ${RC} -eq 0 ]; then + notify_n "[OK] MCP: Docker build finished succesfully!" 2 + else + notify_n "[ERROR] MCP: Docker build threw a fatal error!" + fi +} +# +# End of Exit handlers +############################################################################## + +############################################################################## +# BEGIN of variables to customize +# +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) +DOCKER_DIR=$(cd "${MCP_REPO_ROOT_PATH}/docker"; pwd) +DOCKER_TAG=${1:-latest} +DOCKER_PUSH=${2---push} # pass an empty second arg to disable push +CACHE_INVALIDATE=${CACHE_INVALIDATE:-0} +SALT_VERSION='stable 2017.7' + +source "${DEPLOY_DIR}/globals.sh" +source "${DEPLOY_DIR}/lib.sh" +source "${DEPLOY_DIR}/lib_jump_common.sh" + +[ ! "${TERM:-unknown}" = 'unknown' ] || export TERM=vt220 +[ "${CACHE_INVALIDATE}" = 0 ] || CACHE_INVALIDATE=$(date +%s) + +export LC_ALL=en_US.utf-8 +export LANG=en_US.utf-8 + +# +# END of variables to customize +############################################################################## + +############################################################################## +# BEGIN of main +# + +# Enable the automatic exit trap +trap do_exit SIGINT SIGTERM EXIT + +# Set no restrictive umask so that Jenkins can remove any residuals +umask 0000 + +pushd "${DEPLOY_DIR}" > /dev/null + +# Install distro packages and pip-managed prerequisites +notify "[NOTE] Installing required build-time distro and pip pkgs" 2 +jumpserver_pkg_install 'build' +PYTHON_BIN_PATH="$(python3 -m site --user-base)/bin" +PATH="$PATH:$PYTHON_BIN_PATH" +# Clone git submodules and apply our patches +make -C "${MCP_REPO_ROOT_PATH}/mcp/patches" deepclean patches-import +python3 -m pip install --upgrade pipenv --user +docker_install + +popd > /dev/null +pushd "${DOCKER_DIR}" > /dev/null + +env PIPENV_HIDE_EMOJIS=1 VIRTUALENV_ALWAYS_COPY=1 python3 -m pipenv --three install +env PIPENV_HIDE_EMOJIS=1 VIRTUALENV_ALWAYS_COPY=1 python3 -m pipenv install invoke +# shellcheck disable=SC2086 +env PIPENV_HIDE_EMOJIS=1 python3 -m pipenv run \ + invoke build saltmaster-reclass \ + --require 'salt salt-formulas opnfv reclass tini-saltmaster' \ + --dist=ubuntu \ + --dist-rel=bionic \ + --formula-rev=nightly \ + --opnfv-tag="${DOCKER_TAG}" \ + --salt="${SALT_VERSION}" \ + --build-arg-extra " \ + CACHE_INVALIDATE=\"${CACHE_INVALIDATE}\"" \ + ${DOCKER_PUSH} + +env PIPENV_HIDE_EMOJIS=1 python3 -m pipenv run \ + invoke build saltminion-maas \ + --require 'maas' \ + --dist=ubuntu \ + --dist-rel=bionic \ + --opnfv-tag="${DOCKER_TAG}" \ + --salt="${SALT_VERSION}" \ + --build-arg-extra " \ + CACHE_INVALIDATE=\"${CACHE_INVALIDATE}\"" \ + ${DOCKER_PUSH} + +popd > /dev/null + +# +# END of main +############################################################################## diff --git a/ci/deploy.sh b/ci/deploy.sh index a5fec4d44..d04c4b23c 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -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!" 2 + notify_n "[OK] MCP: Installation of $DEPLOY_SCENARIO finished succesfully!" 2 else - notify_n "[ERROR] MCP: Openstack installation threw a fatal error!" + notify_n "[ERROR] MCP: Installation of $DEPLOY_SCENARIO threw a fatal error!" fi } # @@ -32,35 +32,38 @@ usage () { cat << EOF xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -$(notify "$(basename "$0"): Deploy the Fuel@OPNFV MCP stack" 3) +$(notify "$(basename "$0"): Deploy the OPNFV Fuel MCP stack" 3) $(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] [-N] + [-f] [-F[F]] [-e[e] | -E[E]] [-d] [-D] [-N] [-m] \\ + [-o operating-system] $(notify "OPTIONS:" 2) -b Base-uri for the stack-configuration structure -d Dry-run -D Debug logging - -e Do not launch environment deployment + -e Do not launch environment deployment (use twice to skip cloud setup) -E Remove existing VCP VMs (use twice to redeploy baremetal nodes) - -f Deploy on existing Salt master (use twice to also skip config sync) - -F Do only create a Salt master + -f Deploy on existing Salt master (use twice or more to skip states) + -F Same as -e, do not launch environment deployment (legacy option) -h Print this message and exit -l Lab-name -p Pod-name + -o Use specified operating system for jumpserver/VCP VMs -P Skip installation of package dependencies -s Deploy-scenario short-name - -S Storage dir for VM images + -S Storage dir for VM images and other deploy artifacts -L Deployment log path and file name + -m Use single socket CPU compute nodes (only affects virtual computes) -N Experimental: Do not virtualize control plane (novcp) $(notify_i "Description:" 2) -Deploys the Fuel@OPNFV stack on the indicated lab resource. +Deploys the OPNFV Fuel stack on the indicated lab resource. -This script provides the Fuel@OPNFV deployment abstraction. +This script provides the OPNFV Fuel deployment abstraction. It depends on the OPNFV official configuration directory/file structure and provides a fairly simple mechanism to execute a deployment. @@ -73,33 +76,45 @@ $(notify_i "Input parameters to the build script are:" 2) <base-uri>/labs/<lab-name>/idf-<pod-name>.yaml 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 + If specified twice (e.g. -e -e), only the operating system and networks + will be provisioned, skipping cloud installation. -E Remove existing VCP VMs. It will destroy and undefine all VCP VMs currently defined on cluster KVM nodes. If specified twice (e.g. -E -E), baremetal nodes (VCP too, implicitly) will be removed, then reprovisioned. Only applicable for baremetal deploys. + If specified 3 times, a complete uninstallation (cleanup) will be performed + on the jumpserver (even for virtual deploys): VMs, virsh networks, + containers, networks, services etc. -f Deploy on existing Salt master. It will skip infrastructure VM creation, but it will still sync reclass configuration from current repo to Salt - Master node. If specified twice (e.g. -f -f), config sync will also be - skipped. --F Do only create a Salt master + Master node. + Each additional use skips one more state file. For example, -fff would + skip the first 3 state files (e.g. virtual_init, maas, baremetal_init). +-F Same as -e, do not launch environment deployment (legacy option) -h Print this message and exit -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 +-m Use single socket compute nodes. Instead of using default NUMA-enabled + topology for virtual compute nodes created via libvirt, configure a + single guest CPU socket. -N Experimental: Instead of virtualizing the control plane (VCP), deploy control plane directly on baremetal nodes +-o Operating system to be preinstalled on jumpserver VMs (for virtual/hybrid + deployments) and/or VCP VMs (for baremetal deployments). + Defaults to 'ubuntu1804' (Bionic). -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. 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) @@ -108,7 +123,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 } @@ -120,24 +136,30 @@ EOF # 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) +MCP_REPO_ROOT_PATH=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")/..") +DEPLOY_DIR=$(cd "${MCP_REPO_ROOT_PATH}/mcp/scripts"; pwd) +MCP_STORAGE_DIR='/var/lib/opnfv/tmpdir' URI_REGEXP='(file|https?|ftp)://.*' -BASE_CONFIG_URI="file://${REPO_ROOT_PATH}/mcp/scripts/pharos" +BASE_CONFIG_URI="file://${MCP_REPO_ROOT_PATH}/mcp/scripts/pharos" +OPNFV_BRANCH=$(sed -ne 's/defaultbranch=//p' "${MCP_REPO_ROOT_PATH}/.gitreview") +DEF_DOCKER_TAG=$(basename "${OPNFV_BRANCH/master/latest}") # Customize deploy workflow DRY_RUN=${DRY_RUN:-0} USE_EXISTING_PKGS=${USE_EXISTING_PKGS:-0} USE_EXISTING_INFRA=${USE_EXISTING_INFRA:-0} -INFRA_CREATION_ONLY=${INFRA_CREATION_ONLY:-0} -NO_DEPLOY_ENVIRONMENT=${NO_DEPLOY_ENVIRONMENT:-0} +MCP_NO_DEPLOY_ENVIRONMENT=${MCP_NO_DEPLOY_ENVIRONMENT:-0} ERASE_ENV=${ERASE_ENV:-0} MCP_VCP=${MCP_VCP:-1} +MCP_DOCKER_TAG=${MCP_DOCKER_TAG:-${DEF_DOCKER_TAG}} +MCP_CMP_SS=${MCP_CMP_SS:-0} +MCP_OS=${MCP_OS:-ubuntu1804} source "${DEPLOY_DIR}/globals.sh" source "${DEPLOY_DIR}/lib.sh" source "${DEPLOY_DIR}/lib_template.sh" +source "${DEPLOY_DIR}/lib_jump_common.sh" +source "${DEPLOY_DIR}/lib_jump_deploy.sh" # # END of variables to customize @@ -147,7 +169,7 @@ source "${DEPLOY_DIR}/lib_template.sh" # BEGIN of main # set +x -while getopts "b:dDfEFl:L:Np:Ps:S:he" OPTION +while getopts "b:dDfEFl:L:No:p:Ps:S:he" OPTION do case $OPTION in b) @@ -167,11 +189,8 @@ do f) ((USE_EXISTING_INFRA+=1)) ;; - F) - INFRA_CREATION_ONLY=1 - ;; - e) - NO_DEPLOY_ENVIRONMENT=1 + F|e) + ((MCP_NO_DEPLOY_ENVIRONMENT+=1)) ;; E) ((ERASE_ENV+=1)) @@ -182,16 +201,17 @@ do L) DEPLOY_LOG="${OPTARG}" ;; + m) + MCP_CMP_SS=1 + ;; N) MCP_VCP=0 ;; + o) + MCP_OS=${OPTARG} + ;; p) TARGET_POD=${OPTARG} - if [[ "${TARGET_POD}" =~ virtual ]]; then - # All vPODs will use 'local-virtual1' PDF/IDF for now - TARGET_LAB='local' - TARGET_POD='virtual1' - fi ;; P) USE_EXISTING_PKGS=1 @@ -201,7 +221,7 @@ do ;; S) if [[ ${OPTARG} ]]; then - STORAGE_DIR="${OPTARG}" + MCP_STORAGE_DIR="${OPTARG}" fi ;; h) @@ -238,14 +258,22 @@ pushd "${DEPLOY_DIR}" > /dev/null # scenario, etc. # Install required packages on jump server +sudo mkdir -p "${MCP_STORAGE_DIR}" +sudo chown -R "${USER}:${USER}" "${MCP_STORAGE_DIR}" if [ ${USE_EXISTING_PKGS} -eq 1 ]; then notify "[NOTE] Skipping distro pkg installation" 2 else notify "[NOTE] Installing required distro pkgs" 2 - jumpserver_pkg_install + jumpserver_pkg_install 'deploy' + docker_install "${MCP_STORAGE_DIR}" + virtinst_install "${MCP_STORAGE_DIR}" + # Ubuntu 18.04 cloud image requires newer e2fsprogs + if [[ "${MCP_OS:-}" =~ ubuntu1804 ]]; then + e2fsprogs_install "${MCP_STORAGE_DIR}" + fi fi -if ! virsh list >/dev/null 2>&1; then +if ! ${VIRSH} list >/dev/null 2>&1; then notify_e "[ERROR] This script requires hypervisor access" fi @@ -253,7 +281,7 @@ fi ./sysinfo_print.sh # Clone git submodules and apply our patches -make -C "${REPO_ROOT_PATH}/mcp/patches" deepclean patches-import +make -C "${MCP_REPO_ROOT_PATH}/mcp/patches" deepclean patches-import # Check scenario file existence SCENARIO_DIR="$(readlink -f "../config/scenario")" @@ -267,57 +295,73 @@ generate_ssh_key export MAAS_SSH_KEY="$(cat "$(basename "${SSH_KEY}").pub")" # 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" \ +[[ "${DEPLOY_SCENARIO}" =~ -ha$ ]] || MCP_VCP=0 +export MCP_REPO_ROOT_PATH MCP_VCP MCP_STORAGE_DIR MCP_DOCKER_TAG MCP_CMP_SS \ + MCP_JUMP_ARCH=$(uname -i) MCP_DEPLOY_SCENARIO="${DEPLOY_SCENARIO}" \ + MCP_NO_DEPLOY_ENVIRONMENT MCP_OS MCP_KERNEL_VER +do_templates_scenario "${MCP_STORAGE_DIR}" "${TARGET_LAB}" "${TARGET_POD}" \ + "${BASE_CONFIG_URI}" "${SCENARIO_DIR}" \ "${SCENARIO_DIR}/${DEPLOY_SCENARIO}.yaml" +do_templates_cluster "${MCP_STORAGE_DIR}" "${TARGET_LAB}" "${TARGET_POD}" \ + "${MCP_REPO_ROOT_PATH}" \ + "${SCENARIO_DIR}/defaults.yaml" # Determine additional data (e.g. jump bridge names) based on XDF source "${DEPLOY_DIR}/xdf_data.sh" # Jumpserver prerequisites check notify "[NOTE] Using bridges: ${OPNFV_BRIDGES[*]}" 2 -jumpserver_check_requirements "${virtual_nodes[*]}" "${OPNFV_BRIDGES[@]}" +jumpserver_check_requirements "${cluster_states[*]}" "${virtual_nodes[*]}" \ + "${OPNFV_BRIDGES[@]}" # Infra setup if [ ${DRY_RUN} -eq 1 ]; then notify "[NOTE] Dry run, skipping all deployment tasks" 2 exit 0 +elif [ ${ERASE_ENV} -gt 2 ]; then + notify "[NOTE] Uninstall / cleanup all jumpserver Fuel resources" 2 + cleanup_all "${MCP_STORAGE_DIR}" "${OPNFV_BRIDGES[@]}" + exit 0 elif [ ${USE_EXISTING_INFRA} -gt 0 ]; then - notify "[NOTE] Use existing infra" 2 - check_connection + notify "[NOTE] Use existing infra: skip first ${USE_EXISTING_INFRA} states" 2 + notify "[STATE] Skipping: ${cluster_states[*]::${USE_EXISTING_INFRA}}" 2 else - prepare_vms "${base_image}" "${STORAGE_DIR}" "${virtual_repos_pkgs}" \ - "${virtual_nodes[@]}" + prepare_vms "${base_image}" "${MCP_STORAGE_DIR}" "${virtual_repos_pkgs}" create_networks "${OPNFV_BRIDGES[@]}" do_sysctl_cfg - create_vms "${STORAGE_DIR}" "${virtual_nodes_data}" "${OPNFV_BRIDGES[@]}" - update_mcpcontrol_network + do_udev_cfg + create_vms "${MCP_STORAGE_DIR}" "${virtual_nodes_data}" "${OPNFV_BRIDGES[@]}" start_vms "${virtual_nodes[@]}" - check_connection -fi -if [ ${USE_EXISTING_INFRA} -lt 2 ]; then - wait_for 5 "./salt.sh ${STORAGE_DIR}/pod_config.yml ${virtual_nodes[*]}" + + # https://github.com/docker/libnetwork/issues/1743 + # rm -f /var/lib/docker/network/files/local-kv.db + sudo systemctl restart docker + prepare_containers "${MCP_STORAGE_DIR}" fi +start_containers "${MCP_STORAGE_DIR}" +check_connection + # Openstack cluster setup set +x -if [ ${INFRA_CREATION_ONLY} -eq 1 ] || [ ${NO_DEPLOY_ENVIRONMENT} -eq 1 ]; then +if [ ${MCP_NO_DEPLOY_ENVIRONMENT} -eq 1 ]; then notify "[NOTE] Skip openstack cluster setup" 2 else - for state in "${cluster_states[@]}"; do + for state in "${cluster_states[@]:${USE_EXISTING_INFRA}}"; do 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 \ /root/fuel/mcp/config/states/${state}" + if [ "${state}" = 'maas' ]; then + # For hybrid PODs (virtual + baremetal nodes), the virtual nodes + # should be reset to force a DHCP request from MaaS DHCP + reset_vms "${virtual_nodes[@]}" + fi done -fi -./log.sh "${DEPLOY_LOG}" + ./log.sh "${DEPLOY_LOG}" +fi popd > /dev/null |