summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh11
1 files changed, 5 insertions, 6 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 47662f796..d3882a834 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -241,7 +241,7 @@ if [ ${USE_EXISTING_PKGS} -eq 1 ]; then
else
notify "[NOTE] Installing required distro pkgs" 2
jumpserver_pkg_install 'deploy'
- docker_install
+ docker_install "${MCP_STORAGE_DIR}"
fi
if ! virsh list >/dev/null 2>&1; then
@@ -289,22 +289,21 @@ if [ ${DRY_RUN} -eq 1 ]; then
exit 0
elif [ ${USE_EXISTING_INFRA} -gt 0 ]; then
notify "[NOTE] Use existing infra" 2
- check_connection
else
prepare_vms "${base_image}" "${MCP_STORAGE_DIR}" "${virtual_repos_pkgs}" \
"${virtual_nodes[@]}"
+ prepare_containers "${MCP_STORAGE_DIR}"
create_networks "${OPNFV_BRIDGES[@]}"
do_sysctl_cfg
do_udev_cfg
create_vms "${MCP_STORAGE_DIR}" "${virtual_nodes_data}" "${OPNFV_BRIDGES[@]}"
update_mcpcontrol_network
start_vms "${virtual_nodes[@]}"
- check_connection
-fi
-if [ ${USE_EXISTING_INFRA} -lt 2 ]; then
- wait_for 5 "./salt.sh ${MCP_STORAGE_DIR}/pod_config.yml ${virtual_nodes[*]}"
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