summaryrefslogtreecommitdiffstats
path: root/bootstrap/vagrant-onap/lib/aai
diff options
context:
space:
mode:
Diffstat (limited to 'bootstrap/vagrant-onap/lib/aai')
-rwxr-xr-xbootstrap/vagrant-onap/lib/aai15
1 files changed, 5 insertions, 10 deletions
diff --git a/bootstrap/vagrant-onap/lib/aai b/bootstrap/vagrant-onap/lib/aai
index 828d4d14e..a3e56725f 100755
--- a/bootstrap/vagrant-onap/lib/aai
+++ b/bootstrap/vagrant-onap/lib/aai
@@ -95,17 +95,12 @@ function start_aai_microservices {
done
}
-# _pull_hbase_image() - Pull HBase container image from a Docker Registry Hub
-function _pull_hbase_image {
- docker_openecomp_login
- docker pull $nexus_docker_repo/aaidocker/aai-hbase-${hbase_version}
-}
-
# install_hbase() - Install HBase Service
function install_hbase {
docker rm -f hbase
- _pull_hbase_image
- docker run -d --net=host --name="hbase" $nexus_docker_repo/aaidocker/aai-hbase-${hbase_version}
+ docker_openecomp_login
+ docker pull $nexus_docker_repo/aaidocker/aai-hbase-${hbase_version}
+ run_docker_image -d --net=host --name="hbase" $nexus_docker_repo/aaidocker/aai-hbase-${hbase_version}
}
# install_ajsc() - Install ASJC Java service container
@@ -123,7 +118,7 @@ EOL
pull_openecomp_image ajsc-aai
fi
- docker run --env-file /etc/ajsc-aai.conf --name=aai-service --net=host -v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt -it -d $nexus_docker_repo/openecomp/ajsc-aai:$docker_version
+ run_docker_image --env-file /etc/ajsc-aai.conf --name=aai-service --net=host -v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt -it -d $nexus_docker_repo/openecomp/ajsc-aai:$docker_version
}
# install_model_loader() Install Model Loader
@@ -152,7 +147,7 @@ EOL
pull_openecomp_image model-loader
ARGS+="--name=model-loader-service -it -d --env-file /etc/model-loader.conf $nexus_docker_repo/openecomp/model-loader:$docker_version"
fi
- docker run ${ARGS}
+ run_docker_image ${ARGS}
}
# _wait_for_sdc() - Function that determines if SDC is up and running