Refactor install_docker_compose function
Usually this function is followed by a run command, this change
ensure that docker-compose program is installed before its execution
Change-Id: Ic68616a1db1e3c5bee516985c74f369a956d6775
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-ID: INT-436
diff --git a/bootstrap/vagrant-onap/lib/dcae b/bootstrap/vagrant-onap/lib/dcae
index d6ebd82..25efddd 100755
--- a/bootstrap/vagrant-onap/lib/dcae
+++ b/bootstrap/vagrant-onap/lib/dcae
@@ -58,13 +58,12 @@
# install_dcae() - Function that clones and installs the DCAE controller services from source code
function install_dcae {
- install_docker_compose
pushd ${src_folders[dcae]}/demo/startup/controller
if [[ "$build_image" == "True" ]]; then
dcae_image=`docker images | grep dcae-controller | awk '{print $1 ":" $2}'`
sed -i "s|DOCKER-REGISTRY/openecomp/dcae-controller:DCAE-VERSION|$dcae_image|g" docker-compose.yml
sed -i "s|MTU|$MTU|g" docker-compose.yml
- /opt/docker/docker-compose up -d
+ run_docker_compose .
else
bash init.sh
install_package make