commit f6dbe2829b8ca19bfc0def871036c50642de7770
author Victor Morales <victor.morales@intel.com> Mon Mar 05 10:58:15 2018 -0800
committer Victor Morales <victor.morales@intel.com> Mon Mar 05 10:58:15 2018 -0800
tree 2d0b54239ea46b0bb01faed68052c93772b1b8a2
parent 2bca74c9f23be02aee48455d875c5009f9a152cb

Move src_folder

The SDC simultator mentions[1] the usage of ChefDK as part of tools
for installation/development. The installation process uses the /opt/
folder as destionation and it's affected by the sharing process. This
patchset changes the destionation folder for all the ONAP projects.

[1] https://git.onap.org/sdc/tree/utils/webseal-simulator/sdc-simulator/chef-solo/README.md#n4

Change-Id: Ib800c48864ce2cbe49e699a6d6e913be137af949
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-ID: INT-214

bootstrap/vagrant-onap/lib/sdc

diff --git a/bootstrap/vagrant-onap/lib/sdc b/bootstrap/vagrant-onap/lib/sdc
index d17accf..71a5fea 100755
--- a/bootstrap/vagrant-onap/lib/sdc
+++ b/bootstrap/vagrant-onap/lib/sdc
@@ -50,16 +50,11 @@
     popd
 
     _init_data_folders
-    cp ${src_folders[sdc]}/sdc-os-chef/environments/Template.json /data/environments
-    cp ${src_folders[sdc]}/sdc-os-chef/scripts/docker_run.sh /data/scripts
-    cp ${src_folders[sdc]}/sdc-os-chef/scripts/docker_health.sh /data/scripts
-    cp ${src_folders[sdc]}/sdc-os-chef/scripts/docker_login.sh /data/scripts
-    cp ${src_folders[sdc]}/sdc-os-chef/scripts/docker_clean.sh /data/scripts
-    cp ${src_folders[sdc]}/sdc-os-chef/scripts/simulator_docker_run.sh /data/scripts
 
+    cp ${src_folders[sdc]}/sdc-os-chef/scripts/{docker_run.sh,docker_health.sh,docker_login.sh,docker_clean.sh,simulator_docker_run.sh} /data/scripts
     chmod +x /data/scripts/*.sh
 
-    cat /data/environments/Template.json | sed "s/yyy/"$IP_ADDRESS"/g" > /data/environments/$ENV_NAME.json
+    cat ${src_folders[sdc]}/sdc-os-chef/environments/Template.json | sed "s/yyy/"$IP_ADDRESS"/g" > /data/environments/$ENV_NAME.json
     sed -i "s/xxx/"$ENV_NAME"/g" /data/environments/$ENV_NAME.json
     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
@@ -70,6 +65,7 @@
     else
         bash /data/scripts/docker_run.sh -e $ENV_NAME -r $docker_version -p $(echo $nexus_docker_repo | cut -d':' -f2)
     fi
+    install_chefdk
 }
 
 # init_sdc() - Function that initialize SDC services