Remove customize src_folder variables

There were some leftovers of variables used for pointing to the
project source code folder. This variables are not used anymore.

Change-Id: I355930f8ce6acbc31a1adca61741d7221dee196c
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-ID: INT-367

1 files changed, 7 insertions, 10 deletions

diff --git a/bootstrap/vagrant-onap/lib/sdnc b/bootstrap/vagrant-onap/lib/sdnc
index a8cf756b4..8dacf9e16 100755
--- a/bootstrap/vagrant-onap/lib/sdnc
+++ b/bootstrap/vagrant-onap/lib/sdnc
@@ -7,15 +7,15 @@ source /var/onap/ccsdk
 function compile_all_sdnc_repos {
     for repo in ${repos[sdnc]}; do
         if [[ "$repo" == "sdnc/core" ]]; then
-            compile_src $sdnc_src_folder/core/rootpom
+            compile_src ${src_folders[sdnc]}/core/rootpom
         fi
-        compile_src $sdnc_src_folder${repo#*sdnc}
+        compile_src ${src_folders[sdnc]}${repo#*sdnc}
     done
 }
 
 # _build_sdnc_images() - Builds SDNC images from source code
 function _build_sdnc_images {
-    local folder=$sdnc_src_folder/oam
+    local folder=${src_folders[sdnc]}/oam
 
     get_ccsdk_images
     install_package unzip
@@ -33,19 +33,16 @@ function get_sdnc_images {
     if [[ "$build_image" == "True" ]]; then
         _build_sdnc_images
     else
-        pull_openecomp_image sdnc-image openecomp/sdnc-image:latest
-        pull_openecomp_image admportal-sdnc-image openecomp/admportal-sdnc-image:latest
-        pull_openecomp_image dgbuilder-sdnc-image openecomp/dgbuilder-sdnc-image:latest
+        for image in sdnc-image admportal-sdnc-image dgbuilder-sdnc-image; do
+            pull_openecomp_image $image openecomp/$image:latest
+        done
     fi
     pull_docker_image mysql/mysql-server:5.6
 }
 
 # install_sdnc() -  Download and install SDNC services from source code
 function install_sdnc {
-    pushd $sdnc_src_folder/oam/installation/src/main/yaml
-    install_docker_compose
-    /opt/docker/docker-compose up -d
-    popd
+    run_docker_compose ${src_folders[sdnc]}/oam/installation/src/main/yaml
 }
 
 # init_sdnc() - Function that initialize SDNC services