diff options
Diffstat (limited to 'mcp/scripts')
| -rw-r--r-- | mcp/scripts/docker-compose/docker-compose.yaml.j2 | 2 | ||||
| -rw-r--r-- | mcp/scripts/lib.sh | 4 |
2 files changed, 4 insertions, 2 deletions
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 } |