aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap/vagrant-onap/lib/sdnc
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-03-02 21:59:10 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-02 21:59:10 +0000
commit964af191e5d959ad855636cbab2dfa1350cbfa9e (patch)
treeffa54596302f86f1c2c233e280dc13b3c6b2bbe3 /bootstrap/vagrant-onap/lib/sdnc
parent10d984c3606b5c6a026dea4b9df0954d74d0a8d1 (diff)
parentf8730f5f8d0e044fac2f76f465f285736446c5ca (diff)
Merge "Remove customize src_folder variables"
Diffstat (limited to 'bootstrap/vagrant-onap/lib/sdnc')
-rwxr-xr-xbootstrap/vagrant-onap/lib/sdnc17
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