diff options
| -rw-r--r-- | .gitreview | 2 | ||||
| -rwxr-xr-x | ci/deploy.sh | 3 | ||||
| -rw-r--r-- | mcp/scripts/docker-compose/docker-compose.yaml.j2 | 2 | ||||
| -rw-r--r-- | mcp/scripts/lib.sh | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/.gitreview b/.gitreview index 49ca2619e..8687965ee 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=gerrit.opnfv.org port=29418 project=fuel.git - +defaultbranch=master diff --git a/ci/deploy.sh b/ci/deploy.sh index f64b3b882..4a85412e1 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -137,6 +137,7 @@ USE_EXISTING_INFRA=${USE_EXISTING_INFRA:-0} NO_DEPLOY_ENVIRONMENT=${NO_DEPLOY_ENVIRONMENT:-0} ERASE_ENV=${ERASE_ENV:-0} MCP_VCP=${MCP_VCP:-1} +MCP_DOCKER_TAG=${MCP_DOCKER_TAG:-latest} source "${DEPLOY_DIR}/globals.sh" source "${DEPLOY_DIR}/lib.sh" @@ -264,7 +265,7 @@ export MAAS_SSH_KEY="$(cat "$(basename "${SSH_KEY}").pub")" MCP_DPDK_MODE=$([[ "$DEPLOY_SCENARIO" =~ ovs ]] && echo 1 || echo 0) # Expand jinja2 templates based on PDF data and env vars -export MCP_REPO_ROOT_PATH MCP_VCP MCP_DPDK_MODE MCP_STORAGE_DIR \ +export MCP_REPO_ROOT_PATH MCP_VCP MCP_DPDK_MODE MCP_STORAGE_DIR MCP_DOCKER_TAG \ MCP_JUMP_ARCH=$(uname -i) do_templates_scenario "${MCP_STORAGE_DIR}" "${TARGET_LAB}" "${TARGET_POD}" \ "${BASE_CONFIG_URI}" "${SCENARIO_DIR}" diff --git a/mcp/scripts/docker-compose/docker-compose.yaml.j2 b/mcp/scripts/docker-compose/docker-compose.yaml.j2 index 7099e4fda..ed0400da5 100644 --- a/mcp/scripts/docker-compose/docker-compose.yaml.j2 +++ b/mcp/scripts/docker-compose/docker-compose.yaml.j2 @@ -13,7 +13,7 @@ version: '2' services: opnfv-fuel-salt-master: container_name: "fuel" - image: "opnfv/fuel:saltmaster-reclass-latest" + image: "opnfv/fuel:saltmaster-reclass-{{ conf.MCP_DOCKER_TAG }}" networks: - mcpcontrol - pxebr diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index cc88f9b54..6572074f5 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -493,6 +493,9 @@ function prepare_containers { docker-compose --version > /dev/null 2>&1 || COMPOSE_PREFIX="${image_dir}/" "${COMPOSE_PREFIX}docker-compose" -f docker-compose/docker-compose.yaml down + if [ ! "${MCP_DOCKER_TAG}" = 'verify' ]; then + "${COMPOSE_PREFIX}docker-compose" -f docker-compose/docker-compose.yaml pull + fi sudo rm -rf "${image_dir}/"{salt,hosts,pki} "${image_dir}/nodes/"* mkdir -p "${image_dir}/salt/"{master.d,minion.d} touch "${image_dir}/hosts" @@ -502,7 +505,6 @@ function start_containers { local image_dir=$1 [ -n "${image_dir}" ] || exit 1 docker-compose --version > /dev/null 2>&1 || COMPOSE_PREFIX="${image_dir}/" - "${COMPOSE_PREFIX}docker-compose" -f docker-compose/docker-compose.yaml pull "${COMPOSE_PREFIX}docker-compose" -f docker-compose/docker-compose.yaml up -d } |