diff options
| author |   Victor Morales <victor.morales@intel.com> | 2018-03-02 14:08:39 -0800 |
|---|---|---|
| committer | Victor Morales <victor.morales@intel.com> | 2018-03-02 14:14:02 -0800 |
| commit | 96fe388aea872a5e4b7255422c44be24f77f646f (patch) | |
| tree | 44d11190073bbac6c4c1d96005b4531c21c5e4c3 /bootstrap/vagrant-onap/lib/dcae | |
| parent | 964af191e5d959ad855636cbab2dfa1350cbfa9e (diff) | |
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
Diffstat (limited to 'bootstrap/vagrant-onap/lib/dcae')
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/dcae | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bootstrap/vagrant-onap/lib/dcae b/bootstrap/vagrant-onap/lib/dcae index d6ebd8200..25efddddc 100755 --- a/bootstrap/vagrant-onap/lib/dcae +++ b/bootstrap/vagrant-onap/lib/dcae @@ -58,13 +58,12 @@ function get_dcae_images { # 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 |