[GitHub] rabbah closed pull request #3269: change tmp dir for vagrant

[GitBox <gi...@apache.org>]

rabbah closed pull request #3269: change tmp dir for vagrant
URL: https://github.com/apache/incubator-openwhisk/pull/3269
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/ansible/environments/local/group_vars/all b/ansible/environments/local/group_vars/all
index 0d8dc068aa..fbed10ebe1 100755
--- a/ansible/environments/local/group_vars/all
+++ b/ansible/environments/local/group_vars/all
@@ -1,6 +1,7 @@
 whisk_version_name: local
-config_root_dir: /tmp/wskconf
-whisk_logs_dir: /tmp/wsklogs
+openwhisk_tmp_dir: "{{ lookup('env', 'OPENWHISK_TMP_DIR')|default('/tmp', true) }}"
+config_root_dir: "{{ openwhisk_tmp_dir }}/wskconf"
+whisk_logs_dir: "{{ openwhisk_tmp_dir }}/wsklogs"
 docker_registry: ""
 docker_dns: ""
 bypass_pull_for_local_images: true
diff --git a/tools/vagrant/Vagrantfile b/tools/vagrant/Vagrantfile
index 074aecea54..7d1ef88e28 100644
--- a/tools/vagrant/Vagrantfile
+++ b/tools/vagrant/Vagrantfile
@@ -62,6 +62,7 @@ $script_common = <<SCRIPT
 
   HOME=/home/vagrant
   OPENWHISK_HOME=${HOME}/openwhisk
+  OPENWHISK_TMP_DIR=${HOME}/.openwhisk/ansible/tmp
   ANSIBLE_HOME=${OPENWHISK_HOME}/ansible
   ANSIBLE_REMOTE_TEMP=${ANSIBLE_HOME}/tmp
   # Add Global environments variables
@@ -69,6 +70,7 @@ $script_common = <<SCRIPT
   echo ANSIBLE_HOME=${ANSIBLE_HOME} >> /etc/environment
   echo ANSIBLE_REMOTE_TEMP=${ANSIBLE_REMOTE_TEMP} >> /etc/environment
   echo OPENWHISK_HOME=${OPENWHISK_HOME} >> /etc/environment
+  echo OPENWHISK_TMP_DIR=${OPENWHISK_TMP_DIR} >> /etc/environment
   echo PATH=${PATH}:${HOME}/bin:${OPENWHISK_HOME}/tools/build >> /etc/environment
 
   cd /home/vagrant/openwhisk
@@ -159,8 +161,8 @@ $script_end = <<SCRIPT
   touch $HOME/.wskprops
   chown -R vagrant:vagrant $HOME
   # This allows user to see how to configure the wsk cli outside the VM
+  wsk property set --apihost ${WHISK_IP} --auth `cat ${ANSIBLE_HOME}/files/auth.guest`
   echo "Swagger UI URL: https://${WHISK_IP}/api/v1/docs/index.html?url=/api/v1/api-docs"
-  wsk property set --apihost ${WHISK_IP} --namespace guest --auth `cat ${ANSIBLE_HOME}/files/auth.guest`
   wsk action invoke /whisk.system/utils/echo -p message hello --result
   echo "`date`: build-deploy-end" >> /tmp/vagrant-times.txt
 SCRIPT


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services