diff options
author | Gary Wu <gary.i.wu@huawei.com> | 2018-01-04 08:04:22 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-01-04 08:04:22 +0000 |
commit | 547ab0d2d80a21cdcb513fcd604c4f252b41e531 (patch) | |
tree | 12591d9a866b2a2c795c2535b4cb668a71b0ba41 /bootstrap/vagrant-onap/lib/_onap_functions | |
parent | 908614153b1b4ffc827b1db93afb7f1e496e8f4e (diff) | |
parent | fa9eb9c5c50ca147504cb97226007b82f6909b8a (diff) |
Merge "Add OOM provisioning script"
Diffstat (limited to 'bootstrap/vagrant-onap/lib/_onap_functions')
-rwxr-xr-x | bootstrap/vagrant-onap/lib/_onap_functions | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap/vagrant-onap/lib/_onap_functions b/bootstrap/vagrant-onap/lib/_onap_functions index cedd6f0a3..960b298ef 100755 --- a/bootstrap/vagrant-onap/lib/_onap_functions +++ b/bootstrap/vagrant-onap/lib/_onap_functions @@ -15,7 +15,7 @@ function create_configuration_files { # 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 @@ -23,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-latest} $tag + pull_docker_image ${nexus_docker_repo:-nexus3.onap.org:10001}/openecomp/${image}:${docker_version-latest} $tag docker logout } @@ -32,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-latest} $tag + pull_docker_image ${nexus_docker_repo:-nexus3.onap.org:10001}/onap/${image}:${docker_version-latest} $tag docker logout } |