diff options
Diffstat (limited to 'mcp/scripts/lib.sh')
| -rw-r--r-- | mcp/scripts/lib.sh | 43 |
1 files changed, 39 insertions, 4 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index f5affb0d3..8f7cccd26 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -454,10 +454,7 @@ function create_vms { function update_mcpcontrol_network { # set static ip address for salt master node, MaaS node - local cmac=$(virsh domiflist cfg01 2>&1| awk '/mcpcontrol/ {print $5; exit}') local amac=$(virsh domiflist mas01 2>&1| awk '/mcpcontrol/ {print $5; exit}') - virsh net-update "mcpcontrol" add ip-dhcp-host \ - "<host mac='${cmac}' name='cfg01' ip='${SALT_MASTER}'/>" --live --config [ -z "${amac}" ] || virsh net-update "mcpcontrol" add ip-dhcp-host \ "<host mac='${amac}' name='mas01' ip='${MAAS_IP}'/>" --live --config } @@ -489,6 +486,29 @@ function start_vms { done } +function prepare_containers { + local image_dir=$1 + [ -n "${image_dir}" ] || exit 1 + [ -n "${MCP_REPO_ROOT_PATH}" ] || exit 1 + + "${image_dir}/docker-compose" -f docker-compose/docker-compose.yaml down + sudo rm -rf "${image_dir}/salt" "${image_dir}/nodes/"* + mkdir -p "${image_dir}/salt/"{master.d,minion.d} + # salt state does not properly configure file_roots in master.conf, hard set it + sed -e 's/user: salt/user: root\nfile_recv: True/' -e 's/auto_accept:/open_mode:/' \ + "${MCP_REPO_ROOT_PATH}/docker/files/salt/master.conf" > \ + "${image_dir}/salt/master.d/opnfv.conf" + echo 'master: localhost' > "${image_dir}/salt/minion.d/opnfv.conf" + cp "${MCP_REPO_ROOT_PATH}/mcp/scripts/docker-compose/files/hosts" \ + "${image_dir}/hosts" +} + +function start_containers { + local image_dir=$1 + [ -n "${image_dir}" ] || exit 1 + "${image_dir}/docker-compose" -f docker-compose/docker-compose.yaml up --quiet-pull -d +} + function check_connection { local total_attempts=60 local sleep_time=5 @@ -584,12 +604,27 @@ function get_nova_compute_pillar_data { } function docker_install { + local image_dir=$1 # Mininum effort attempt at installing Docker if missing - if ! which docker; then + if ! docker --version; then curl -fsSL https://get.docker.com -o get-docker.sh sudo sh get-docker.sh rm get-docker.sh # On RHEL distros, the Docker service should be explicitly started sudo systemctl start docker + else + DOCKER_VER=$(docker version --format '{{.Server.Version}}') + if [ "${DOCKER_VER%%.*}" -lt 2 ]; then + notify_e "[ERROR] Docker version ${DOCKER_VER} is too old, please upgrade it." + fi + fi + # Distro-provided docker-compose might be simply broken (Ubuntu 16.04, CentOS 7) + COMPOSE_BIN="${image_dir}/docker-compose" + COMPOSE_VERSION='1.22.0' + notify_n "[WARN] Using docker-compose ${COMPOSE_VERSION} in ${COMPOSE_BIN}" 3 + if [ ! -e "${COMPOSE_BIN}" ]; then + COMPOSE_URL="https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}" + sudo curl -L "${COMPOSE_URL}/docker-compose-$(uname -s)-$(uname -m)" -o "${COMPOSE_BIN}" + sudo chmod +x "${COMPOSE_BIN}" fi } |