10 files changed, 50 insertions, 29 deletions
diff --git a/bootstrap/vagrant-onap/lib/aai b/bootstrap/vagrant-onap/lib/aai
index 2b7f98106..7d87870a0 100755
--- a/bootstrap/vagrant-onap/lib/aai
+++ b/bootstrap/vagrant-onap/lib/aai
@@ -179,8 +179,12 @@ function init_aai {
     install_hadoop
     install_haproxy
 
-    clone_all_aai_repos
-    compile_aai_repos
+    if [[ "$clone_repo" == "True" ]]; then
+        clone_all_aai_repos
+        if [[ "$compile_repo" == "True" ]]; then
+            compile_aai_repos
+        fi
+    fi
 
     setup_titan
     #start_aai_microservices
diff --git a/bootstrap/vagrant-onap/lib/appc b/bootstrap/vagrant-onap/lib/appc
index a0959c67a..33980aeea 100755
--- a/bootstrap/vagrant-onap/lib/appc
+++ b/bootstrap/vagrant-onap/lib/appc
@@ -45,9 +45,11 @@ function install_appc {
 
 # init_appc() - Function that initialize APPC services
 function init_appc {
-    clone_all_appc_repos
-    if [[ "$compile_repo" == "True" ]]; then
-        compile_all_appc_repos
+    if [[ "$clone_repo" == "True" ]]; then
+        clone_all_appc_repos
+        if [[ "$compile_repo" == "True" ]]; then
+            compile_all_appc_repos
+        fi
     fi
 
     get_appc_images
diff --git a/bootstrap/vagrant-onap/lib/asdc b/bootstrap/vagrant-onap/lib/asdc
index bbd3d3bc5..fb7b40b04 100755
--- a/bootstrap/vagrant-onap/lib/asdc
+++ b/bootstrap/vagrant-onap/lib/asdc
@@ -71,11 +71,6 @@ function install_sdc {
     local RELEASE=$docker_version
     NEXUS_DOCKER_PORT=$(echo $nexus_docker_repo | cut -d':' -f2)
 
-    clone_all_sdc_repos
-    if [[ "$compile_repo" == "True" ]]; then
-        compile_all_sdc_repos
-    fi
-
     if [[ "$build_image" == "True" ]]; then
         compile_src $src_folder
         build_docker_image $src_folder/sdc-os-chef docker
@@ -106,5 +101,11 @@ function init_asdc {
     mount_external_partition
     init_data_folders
     setup_docker_aliases
+    if [[ "$clone_repo" == "True" ]]; then
+        clone_all_sdc_repos
+        if [[ "$compile_repo" == "True" ]]; then
+            compile_all_sdc_repos
+        fi
+    fi
     install_sdc
 }
diff --git a/bootstrap/vagrant-onap/lib/dcae b/bootstrap/vagrant-onap/lib/dcae
index dce55aec4..43da9f59b 100755
--- a/bootstrap/vagrant-onap/lib/dcae
+++ b/bootstrap/vagrant-onap/lib/dcae
@@ -120,9 +120,11 @@ function install_dcae {
 
 # init_dcae() - Function that initialize DCAE Controller services
 function init_dcae {
-    clone_all_dcae_repos
-    if [[ "$compile_repo" == "True" ]]; then
-        compile_all_dcae_repos
+    if [[ "$clone_repo" == "True" ]]; then
+        clone_all_dcae_repos
+        if [[ "$compile_repo" == "True" ]]; then
+            compile_all_dcae_repos
+        fi
     fi
 
     _create_config_file
diff --git a/bootstrap/vagrant-onap/lib/mr b/bootstrap/vagrant-onap/lib/mr
index 76b27b1ea..5bd1d1aaf 100755
--- a/bootstrap/vagrant-onap/lib/mr
+++ b/bootstrap/vagrant-onap/lib/mr
@@ -28,7 +28,9 @@ function install_message_router {
 
 # init_mr() - Function that initialize Message Router services
 function init_mr {
-    clone_mr_repos
+    if [[ "$clone_repo" == "True" ]]; then
+        clone_mr_repos
+    fi
     get_mr_images
     install_message_router
 }
diff --git a/bootstrap/vagrant-onap/lib/mso b/bootstrap/vagrant-onap/lib/mso
index 4f88e9085..4b209062d 100755
--- a/bootstrap/vagrant-onap/lib/mso
+++ b/bootstrap/vagrant-onap/lib/mso
@@ -101,9 +101,11 @@ EOF
 
 # init_mso() - Function that initialize MSO services
 function init_mso {
-    clone_all_mso_repos
-    if [[ "$compile_repo" == "True" ]]; then
-        compile_all_mso_repos
+    if [[ "$clone_repo" == "True" ]]; then
+        clone_all_mso_repos
+        if [[ "$compile_repo" == "True" ]]; then
+            compile_all_mso_repos
+        fi
     fi
 
     install_mso
diff --git a/bootstrap/vagrant-onap/lib/policy b/bootstrap/vagrant-onap/lib/policy
index c117c41c9..5b3e58109 100755
--- a/bootstrap/vagrant-onap/lib/policy
+++ b/bootstrap/vagrant-onap/lib/policy
@@ -58,9 +58,11 @@ function install_policy {
 
 # init_policy() - Function that initialize Policy services
 function init_policy {
-    clone_all_policy_repos
-    if [[ "$compile_repo" == "True" ]]; then
-        compile_all_policy_repos
+    if [[ "$clone_repo" == "True" ]]; then
+        clone_all_policy_repos
+        if [[ "$compile_repo" == "True" ]]; then
+            compile_all_policy_repos
+        fi
     fi
 
     get_policy_images
diff --git a/bootstrap/vagrant-onap/lib/sdnc b/bootstrap/vagrant-onap/lib/sdnc
index 9a3f9b032..c7c2745d8 100755
--- a/bootstrap/vagrant-onap/lib/sdnc
+++ b/bootstrap/vagrant-onap/lib/sdnc
@@ -63,9 +63,11 @@ function install_sdnc {
 # init_sdnc() - Function that initialize SDNC services
 function init_sdnc {
     start_ODL
-    clone_all_sdnc_repos
-    if [[ "$compile_repo" == "True" ]]; then
-        compile_all_sdnc_repos
+    if [[ "$clone_repo" == "True" ]]; then
+        clone_all_sdnc_repos
+        if [[ "$compile_repo" == "True" ]]; then
+            compile_all_sdnc_repos
+        fi
     fi
     get_sdnc_images
     install_sdnc
diff --git a/bootstrap/vagrant-onap/lib/vfc b/bootstrap/vagrant-onap/lib/vfc
index 13e301598..9c232be28 100755
--- a/bootstrap/vagrant-onap/lib/vfc
+++ b/bootstrap/vagrant-onap/lib/vfc
@@ -52,9 +52,11 @@ function install_vfc {
 function init_vfc {
     install_package libmysqlclient-dev
 
-    clone_all_vfc_repos
-    if [[ "$compile_repo" == "False" ]]; then
-        compile_all_vfc_repos
+    if [[ "$clone_repo" == "True" ]]; then
+        clone_all_vfc_repos
+        if [[ "$compile_repo" == "False" ]]; then
+            compile_all_vfc_repos
+        fi
     fi
 
     install_vfc
diff --git a/bootstrap/vagrant-onap/lib/vid b/bootstrap/vagrant-onap/lib/vid
index fc622c3c2..55f399ab0 100755
--- a/bootstrap/vagrant-onap/lib/vid
+++ b/bootstrap/vagrant-onap/lib/vid
@@ -49,9 +49,11 @@ function install_vid {
 
 # init_vid() - Function that initialize Vid services
 function init_vid {
-    clone_all_vid_repos
-    if [[ "$compile_repo" == "True" ]]; then
-        compile_all_vid_repos
+    if [[ "$clone_repo" == "True" ]]; then
+        clone_all_vid_repos
+        if [[ "$compile_repo" == "True" ]]; then
+            compile_all_vid_repos
+        fi
     fi
 
     get_vid_images