Added parameter for pulling docker images

Updated sdc script accordingly

Change-Id: I6de1c52ff42fc1f47cdfa0f56921c864c7182dcb
Issue-Id: INT-101
Signed-off-by: Idan Amit <ia096e@intl.att.com>

diff --git a/bootstrap/vagrant-onap/Vagrantfile b/bootstrap/vagrant-onap/Vagrantfile
index 4b32fef..21766fe 100644 (file)
--- 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 0c09b0b..fa4e499 100755 (executable)
--- 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