aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-10-09 02:58:25 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-09 02:58:25 +0000
commit9e9fcf4f63c42173187aa2518525e229b3f85a38 (patch)
tree62523179bc7627a2e93c259f8793fc383d42eea5
parentd0709b896d63f1312bfd322b9c0a1be0bf70d39a (diff)
parenta44489ef7f3e81475f3ef9718a8a4bda8b4dd029 (diff)
Merge "Implement skip_install case exception"
-rwxr-xr-xbootstrap/vagrant-onap/lib/sdc12
1 files changed, 8 insertions, 4 deletions
diff --git a/bootstrap/vagrant-onap/lib/sdc b/bootstrap/vagrant-onap/lib/sdc
index c7f79d64d..1d21e138b 100755
--- a/bootstrap/vagrant-onap/lib/sdc
+++ b/bootstrap/vagrant-onap/lib/sdc
@@ -96,7 +96,11 @@ function install_sdc {
sed -i "s/\"fqdn\":.*/\"fqdn\": [\""$MR_IP_ADDR"\", \""$MR_IP_ADDR"\"]/g" /data/environments/$ENV_NAME.json
install_docker
- bash /data/scripts/docker_run.sh -e $ENV_NAME -l
+ if [[ "$skip_get_images" == "False" ]]; then
+ bash /data/scripts/docker_run.sh -e $ENV_NAME -l
+ else
+ bash /data/scripts/docker_run.sh -e $ENV_NAME -r $docker_version -p $(echo $nexus_docker_repo | cut -d':' -f2)
+ fi
}
# init_sdc() - Function that initialize SDC services
@@ -111,9 +115,9 @@ function init_sdc {
if [[ "$skip_get_images" == "False" ]]; then
get_sdc_images
- if [[ "$skip_install" == "False" ]]; then
- install_sdc
- fi
+ fi
+ if [[ "$skip_install" == "False" ]]; then
+ install_sdc
fi
_setup_docker_aliases
}