Add OOM provisioning script

[integration.git] / bootstrap / vagrant-onap / lib / _onap_functions

diff --git a/bootstrap/vagrant-onap/lib/_onap_functions b/bootstrap/vagrant-onap/lib/_onap_functions
index 18a4659..960b298 100755 (executable)
--- a/bootstrap/vagrant-onap/lib/_onap_functions
+++ b/bootstrap/vagrant-onap/lib/_onap_functions
@@ -12,11 +12,10 @@ function create_configuration_files {
     echo $docker_version > /opt/config/docker_version.txt
 }
 
-# TODO(electrocucaracha): Determine how to use this behind a proxy
 # docker_openecomp_login() - Login to OpenECOMP Docker Hub
 function docker_openecomp_login {
     install_docker
-    docker login -u $nexus_username -p $nexus_password $nexus_docker_repo
+    docker login -u ${nexus_username:-docker} -p ${nexus_password:-docker} ${nexus_docker_repo:-nexus3.onap.org:10001}
 }
 
 # pull_openecomp_image() - Pull Docker container image from a Docker Registry Hub
@@ -24,7 +23,7 @@ function pull_openecomp_image {
     local image=$1
     local tag=$2
     docker_openecomp_login
-    pull_docker_image $nexus_docker_repo/openecomp/${image}:$docker_version $tag
+    pull_docker_image ${nexus_docker_repo:-nexus3.onap.org:10001}/openecomp/${image}:${docker_version-latest} $tag
     docker logout
 }
 
@@ -33,7 +32,7 @@ function pull_onap_image {
     local image=$1
     local tag=$2
     docker_openecomp_login
-    pull_docker_image $nexus_docker_repo/onap/${image}:$docker_version $tag
+    pull_docker_image ${nexus_docker_repo:-nexus3.onap.org:10001}/onap/${image}:${docker_version-latest} $tag
     docker logout
 }