diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2017-08-21 20:51:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-08-21 20:51:17 +0000 |
| commit | 62844a2e3b926bce5de90f5020b8a0756cf2a7d1 (patch) | |
| tree | c6554baf40a40f214e817443b1b6e472de5b2305 | |
| parent | 93545b6a8fdb7f5b779b92526576469ad71df45a (diff) | |
| parent | 0a295559ea688477327e4e9fa430d72e4bf82eea (diff) | |
Merge "Added parameter for pulling docker images"
| -rw-r--r-- | bootstrap/vagrant-onap/Vagrantfile | 1 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/asdc | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/bootstrap/vagrant-onap/Vagrantfile b/bootstrap/vagrant-onap/Vagrantfile index 4b32fef97..21766fe00 100644 --- a/bootstrap/vagrant-onap/Vagrantfile +++ b/bootstrap/vagrant-onap/Vagrantfile @@ -25,6 +25,7 @@ conf = { 'nexus_url_snapshot' => 'https://nexus.onap.org/content/repositories/snapshots', 'gitlab_branch' => 'master', 'build_image' => 'True', + 'pull_docker_image' => 'True', 'odl_version' => '0.5.3-Boron-SR3', 'compile_repo' => 'False', 'enable_oparent' => 'True' diff --git a/bootstrap/vagrant-onap/lib/asdc b/bootstrap/vagrant-onap/lib/asdc index 0c09b0b64..fa4e499f7 100755 --- a/bootstrap/vagrant-onap/lib/asdc +++ b/bootstrap/vagrant-onap/lib/asdc @@ -95,8 +95,11 @@ function install_sdc { sed -i "s/\"ueb_url_list\":.*/\"ueb_url_list\": \""$MR_IP_ADDR","$MR_IP_ADDR"\",/g" /data/environments/$ENV_NAME.json sed -i "s/\"fqdn\":.*/\"fqdn\": [\""$MR_IP_ADDR"\", \""$MR_IP_ADDR"\"]/g" /data/environments/$ENV_NAME.json - docker_openecomp_login - bash /data/scripts/docker_run.sh -e $ENV_NAME -r $RELEASE -p $NEXUS_DOCKER_PORT + install_docker + if [[ "$pull_docker_image" == "True" ]]; then + docker_openecomp_login + bash /data/scripts/docker_run.sh -e $ENV_NAME -r $RELEASE -p $NEXUS_DOCKER_PORT + fi } # init_asdc() - Function that initialize SDC services |